Skip to content

change the order of type arguments on ControlFlow#76614

Merged
bors merged 2 commits intorust-lang:masterfrom
NoraCodes:nora/control_flow_enum
Oct 25, 2020
Merged

change the order of type arguments on ControlFlow#76614
bors merged 2 commits intorust-lang:masterfrom
NoraCodes:nora/control_flow_enum

Conversation

@NoraCodes
Copy link
Contributor

@NoraCodes NoraCodes commented Sep 11, 2020 •
edited by jyn514
Loading

This allows ControlFlow<BreakType> which is much more ergonomic for common iterator combinator use cases.

Addresses one component of #75744

@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 11, 2020

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 11, 2020
@NoraCodes
Copy link
Contributor Author

NoraCodes commented Sep 11, 2020

r? @scottmcm

@NoraCodes NoraCodes force-pushed the nora/control_flow_enum branch from 4098cac to 09111dc Compare September 11, 2020 21:48
ecstatic-morse
ecstatic-morse approved these changes Sep 11, 2020
View reviewed changes
Copy link
Contributor

@ecstatic-morse ecstatic-morse left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM besides the one nit. I'll let @scottmcm have a look though.

compiler/rustc_data_structures/src/graph/iterate/mod.rs Outdated
Copy link
Contributor

@ecstatic-morse ecstatic-morse Sep 11, 2020

Choose a reason for hiding this comment

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

Re-exporting a standard library type is somewhat unusual, could you change the use sites to import std::ops::ControlFlow instead?

scottmcm
scottmcm approved these changes Sep 12, 2020
View reviewed changes
Copy link
Member

@scottmcm scottmcm left a comment

Choose a reason for hiding this comment

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

Thanks @NoraCodes! I agree with morse's nit, then LGTM after that.

@scottmcm scottmcm mentioned this pull request Sep 12, 2020
Closed
9 tasks
@jyn514 jyn514 added requires-nightly This issue requires a nightly compiler in some way. When possible, use a F-* label instead. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 15, 2020
@camelid camelid 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 7, 2020
@camelid
Copy link
Member

camelid commented Oct 7, 2020

@NoraCodes It looks like this is very close to being ready to merge! Could you address #76614 (comment)?

@NoraCodes
Copy link
Contributor Author

NoraCodes commented Oct 7, 2020

Will do, apologies for taking so long on this.

@camelid
Copy link
Member

camelid commented Oct 7, 2020

No worries :)

@NoraCodes
Copy link
Contributor Author

NoraCodes commented Oct 21, 2020

Finally actually got around to setting up a Rust dev environment on my personal machine. 😅

@scottmcm
Copy link
Member

scottmcm commented Oct 21, 2020

Thanks, @NoraCodes!

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Oct 21, 2020

📌 Commit a41795650c73a412a79aef06e71d068e2b707d8a has been approved by scottmcm

@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 Oct 21, 2020
@LeSeulArtichaut
Copy link
Contributor

LeSeulArtichaut commented Oct 22, 2020

@NoraCodes This conflicted with #78200, you'll have to rebase to merge this PR.

@LeSeulArtichaut LeSeulArtichaut 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 Oct 22, 2020
@NoraCodes @scottmcm
change the order of type arguments on ControlFlow
84daccc 
This allows ControlFlow<BreakType> which is much more ergonomic for
common iterator combinator use cases.
@NoraCodes @scottmcm
Don't re-export std::ops::ControlFlow in the compiler.
bc23179
@scottmcm scottmcm force-pushed the nora/control_flow_enum branch from a417956 to bc23179 Compare October 23, 2020 00:27
@scottmcm
Copy link
Member

scottmcm commented Oct 23, 2020

Rebased.

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 23, 2020

📌 Commit bc23179 has been approved by scottmcm

@bors
Copy link
Collaborator

bors commented Oct 23, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Oct 23, 2020
@jonas-schievink jonas-schievink mentioned this pull request Oct 24, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 24, 2020
@bors
Auto merge of rust-lang#78334 - jonas-schievink:rollup-z0gzbmm, r=jon…
f58ffc9 
…as-schievink

Rollup of 12 pull requests

Successful merges:

 - rust-lang#75115 (`#[deny(unsafe_op_in_unsafe_fn)]` in sys/cloudabi)
 - rust-lang#76614 (change the order of type arguments on ControlFlow)
 - rust-lang#77610 (revise Hermit's mutex interface to support the behaviour of StaticMutex)
 - rust-lang#77830 (Simplify query proc-macros)
 - rust-lang#77930 (Do not ICE with TraitPredicates containing [type error])
 - rust-lang#78069 (Fix const core::panic!(non_literal_str).)
 - rust-lang#78072 (Cleanup constant matching in exhaustiveness checking)
 - rust-lang#78119 (Throw core::panic!("message") as &str instead of String.)
 - rust-lang#78191 (Introduce a temporary for discriminant value in MatchBranchSimplification)
 - rust-lang#78272 (const_evaluatable_checked: deal with unused nodes + div)
 - rust-lang#78318 (TyCtxt: generate single impl block with `slice_interners` macro)
 - rust-lang#78327 (resolve: Relax macro resolution consistency check to account for any errors)

Failed merges:

r? `@ghost`
@bors bors merged commit a547055 into rust-lang:master Oct 25, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 25, 2020
@calebcartwright calebcartwright mentioned this pull request Oct 25, 2020
Closed
@scottmcm scottmcm mentioned this pull request Oct 29, 2020
Closed
3 tasks
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Nov 15, 2020
Merged
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.49.0, 1.48.0 Nov 15, 2020
@Mark-Simulacrum Mark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 15, 2020
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Nov 15, 2020

This was backported into 1.48 (approved by me) in #79075 as a dependency of #78775.

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2020
@bors
Auto merge of rust-lang#79075 - Mark-Simulacrum:beta-next, r=Mark-Sim…
8236dc0 
…ulacrum

[beta] next

This backports:

* Avoid installing external LLVM dylibs rust-lang#78986
* Install CI llvm into the library directory rust-lang#79074
* Revert "Revert "resolve: Avoid "self-confirming" import resolutions in one more case"" rust-lang#78784
* Bump Rustfmt and RLS rust-lang#78775
* Enforce no-move rule of ReentrantMutex using Pin and fix UB in stdio rust-lang#77801

For RLS/rustfmt compilation to succeed:
* change the order of type arguments on ControlFlow rust-lang#76614
* Add ControlFlow::is_{break,continue} methods rust-lang#78200
* Replace run_compiler with RunCompiler builder pattern rust-lang#77649

As a dependency of rust-lang#77801:
*  Add Pin::static_ref, static_mut. rust-lang#77726
@heaths heaths mentioned this pull request Oct 18, 2022
Open
23 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@scottmcm scottmcm scottmcm approved these changes

+1 more reviewer

@ecstatic-morse ecstatic-morse ecstatic-morse approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@scottmcm scottmcm

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. requires-nightly This issue requires a nightly compiler in some way. When possible, use a F-* label instead. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.48.0

Development

Successfully merging this pull request may close these issues.

10 participants

@NoraCodes @rust-highfive @camelid @scottmcm @bors @LeSeulArtichaut @Mark-Simulacrum @ecstatic-morse @jyn514 @rustbot