Skip to content

Implement edition-based macro :pat feature - #80459

Merged
bors merged 1 commit into
rust-lang:masterfrom
mark-i-m:or-pat-reg
Dec 31, 2020
Merged

Implement edition-based macro :pat feature#80459
bors merged 1 commit into
rust-lang:masterfrom
mark-i-m:or-pat-reg

Conversation

@mark-i-m

@mark-i-mmark-i-m commented Dec 28, 2020

Copy link
Copy Markdown
Contributor

This PR does two things:

  1. Fixes the perf regression from or_patterns: implement :pat edition-specific behavior #80100 (comment)
  2. Implements :pat2018 and :pat2021 matchers, as described by @joshtriplett in Tracking issue for RFC 2535, 2530, 2175, "Or patterns, i.e Foo(Bar(x) | Baz(x))" #54883 (comment) behind the feature gate edition_macro_pat.

r? @petrochenkov

cc @Mark-Simulacrum

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2020
@mark-i-m

mark-i-m commented Dec 28, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors rollup=never

@bors

bors commented Dec 28, 2020

Copy link
Copy Markdown
Collaborator

@mark-i-m: 🔑 Insufficient privileges: not in try users

@rust-log-analyzer

This comment has been minimized.

Sign in to view
petrochenkov
petrochenkov reviewed Dec 29, 2020
View reviewed changes
Comment threadsrc/test/ui/macros/macro-follow.rs Outdated
Comment threadcompiler/rustc_parse/src/parser/nonterminal.rs Outdated
Comment threadcompiler/rustc_parse/src/parser/nonterminal.rs Outdated
Comment threadcompiler/rustc_ast/src/token.rs Outdated
@petrochenkovpetrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2020
@mark-i-m

mark-i-m commented Dec 29, 2020

Copy link
Copy Markdown
ContributorAuthor

@rustbot modify labels: +S-waiting-on-author -S-waiting-on-review

@petrochenkovpetrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 29, 2020
petrochenkov
petrochenkov reviewed Dec 30, 2020
View reviewed changes
Comment threadsrc/test/ui/macros/macro-input-future-proofing.rs Outdated
@petrochenkov

petrochenkov commented Dec 30, 2020

Copy link
Copy Markdown
Contributor

r=me with commits squashed.

@petrochenkovpetrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 30, 2020
@mark-i-m

mark-i-m commented Dec 30, 2020

Copy link
Copy Markdown
ContributorAuthor

@petrochenkov Fixed nit and squashed.

@petrochenkov

petrochenkov commented Dec 31, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Dec 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 40bf3c0 has been approved by petrochenkov

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 31, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 31, 2020
@Dylan-DPC
Rollup merge ofrust-lang#80459- mark-i-m:or-pat-reg, r=petrochenkov
6452dd4
Implement edition-based macro :pat feature
This PR does two things:
1. Fixes the perf regression from rust-lang#80100 (comment)
2. Implements `:pat2018` and `:pat2021` matchers, as described by `@joshtriplett` in rust-lang#54883 (comment) behind the feature gate `edition_macro_pat`.
r? `@petrochenkov`
cc `@Mark-Simulacrum`
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Dec 31, 2020
Closed
@bors

bors commented Dec 31, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 40bf3c0 with merge 44e3daf...

@bors

bors commented Dec 31, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 44e3daf to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2020
@bors
bors merged commit 44e3daf into rust-lang:masterDec 31, 2020
@rustbotrustbot added this to the 1.51.0 milestone Dec 31, 2020
@rust-highfive

rust-highfive commented Dec 31, 2020

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #80459!

Tested on commit 44e3daf.
Direct link to PR: #80459

💔 rls on windows: test-pass → test-fail (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 31, 2020
@rust-highfive
📣 Toolstate changed byrust-lang/rust#80459!
47865d6
Tested on commit rust-lang/rust@44e3daf.
Direct link to PR: <rust-lang/rust#80459>
💔 rls on windows: test-pass → test-fail (cc @Xanewok).
This was referenced Dec 31, 2020
Merged
Merged
Merged
Merged
Closed
Merged
@mark-i-m
mark-i-m deleted the or-pat-reg branch January 1, 2021 07:29
This was referenced Jan 1, 2021
Merged
Closed
@m-ou-sem-ou-se mentioned this pull request Sep 3, 2021
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.51.0

Development

Successfully merging this pull request may close these issues.

7 participants

@mark-i-m@bors@rust-log-analyzer@petrochenkov@rust-highfive@m-ou-se@rustbot