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

Prepare for lowering or-patterns #67592

Merged
merged 5 commits into from
Dec 26, 2019
Merged

Prepare for lowering or-patterns #67592

merged 5 commits into from
Dec 26, 2019

Conversation

matthewjasper
Copy link
Contributor

@matthewjasper matthewjasper commented Dec 24, 2019 •
edited by Centril
Loading

This is probably best reviewed commit-by-commit.

  • Rustfmt rustc_mir::build::{self, matches}
  • Remove -Znll-dont-emit-read-for-match
  • Split match_expr into smaller functions
  • Feature gate or-patterns in const contexts

cc #54883

r? @Centril

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 24, 2019
@Centril Centril added F-const_if_match F-or_patterns `#![feature(or_patterns)]` labels Dec 24, 2019
Centril
Centril reviewed Dec 24, 2019
View reviewed changes
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!

I mostly have some questions and requests around documentation and comments. :)

src/librustc_mir/build/matches/mod.rs Outdated Show resolved Hide resolved
src/librustc_mir/build/matches/mod.rs Outdated Show resolved Hide resolved
src/librustc_mir/build/matches/mod.rs Show resolved Hide resolved
src/librustc_mir/build/matches/mod.rs Show resolved Hide resolved
src/librustc_mir/build/matches/mod.rs Show resolved Hide resolved
src/librustc_mir/build/matches/mod.rs Show resolved Hide resolved
src/librustc_mir/build/matches/mod.rs Show resolved Hide resolved
src/librustc_mir/build/matches/mod.rs Show resolved Hide resolved
src/librustc_passes/check_const.rs Show resolved Hide resolved
src/test/ui/or-patterns/already-bound-name.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

Sign in to view
@matthewjasper matthewjasper force-pushed the cleanup-match branch 2 times, most recently from 9caf019 to 406082b Compare December 24, 2019 19:54
Centril
Centril approved these changes Dec 24, 2019
View reviewed changes
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! r=me with this last nit fixed.

src/librustc_mir/build/matches/mod.rs Outdated Show resolved Hide resolved
@matthewjasper

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 24, 2019
@bors

This comment has been minimized.

Sign in to view
@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 25, 2019
@matthewjasper
Copy link
Contributor Author

@bors r=Centril

@bors
Copy link
Contributor

bors commented Dec 25, 2019

📌 Commit 0a14cbe has been approved by Centril

@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 25, 2019
@bors
Copy link
Contributor

bors commented Dec 26, 2019

⌛ Testing commit 0a14cbe with merge 3e0a1c0...

bors added a commit that referenced this pull request Dec 26, 2019
@bors
Auto merge of #67592 - matthewjasper:cleanup-match, r=Centril
3e0a1c0 
Prepare for lowering or-patterns

This is probably best reviewed commit-by-commit.

* Rustfmt `rustc_mir::build::{self, matches}`
* Remove `-Znll-dont-emit-read-for-match`
* Split `match_expr` into smaller functions
* Feature gate or-patterns in const contexts

cc #54883

r? @Centril
@bors
Copy link
Contributor

bors commented Dec 26, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 3e0a1c0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 26, 2019
@bors bors merged commit 0a14cbe into rust-lang:master Dec 26, 2019
This was referenced Dec 26, 2019
Merged
Merged
Merged
@Centril Centril mentioned this pull request Dec 27, 2019
Closed
8 tasks
@matthewjasper matthewjasper deleted the cleanup-match branch December 27, 2019 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril approved these changes

Assignees

@Centril Centril

Labels
F-or_patterns `#![feature(or_patterns)]` 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
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@matthewjasper @rust-highfive @bors @Centril