Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement edition-based macro :pat feature #80459

Merged
merged 1 commit into from
Dec 31, 2020
Merged

Implement edition-based macro :pat feature #80459

merged 1 commit into from
Dec 31, 2020

Conversation

mark-i-m
Copy link
Member

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-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2020
@mark-i-m
Copy link
Member Author

@bors rollup=never

@bors
Copy link
Contributor

bors commented Dec 28, 2020

@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
src/test/ui/macros/macro-follow.rs Outdated Show resolved Hide resolved
compiler/rustc_parse/src/parser/nonterminal.rs Outdated Show resolved Hide resolved
compiler/rustc_parse/src/parser/nonterminal.rs Outdated Show resolved Hide resolved
compiler/rustc_ast/src/token.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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
Copy link
Member Author

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

@petrochenkov petrochenkov 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
Copy link
Contributor

r=me with commits squashed.

@petrochenkov petrochenkov 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
Copy link
Member Author

@petrochenkov Fixed nit and squashed.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Dec 31, 2020

📌 Commit 40bf3c0 has been approved by petrochenkov

@bors bors 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 of rust-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-zz Dylan-DPC-zz mentioned this pull request Dec 31, 2020
Closed
@bors
Copy link
Contributor

bors commented Dec 31, 2020

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

@bors
Copy link
Contributor

bors commented Dec 31, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2020
@bors bors merged commit 44e3daf into rust-lang:master Dec 31, 2020
@rustbot rustbot added this to the 1.51.0 milestone Dec 31, 2020
@rust-highfive
Copy link
Collaborator

📣 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 by rust-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-se m-ou-se mentioned this pull request Sep 3, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: 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.
6 participants
@mark-i-m @bors @rust-log-analyzer @petrochenkov @rust-highfive @rustbot