change the order of type arguments on ControlFlow #76614
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @scottmcm |
NoraCodes
force-pushed
the
nora/control_flow_enum
branch
from
4098cac to
09111dc
Compare
ecstatic-morse
approved these changes
Sep 11, 2020
There was a problem hiding this comment.
LGTM besides the one nit. I'll let @scottmcm have a look though.
| @@ -87,8 +87,7 @@ where | |||
| } | |||
|
|
|||
| /// Allows searches to terminate early with a value. | |||
| // FIXME (#75744): remove the alias once the generics are in a better order and `C=()`. | |||
| pub type ControlFlow<T> = std::ops::ControlFlow<(), T>; | |||
| pub use std::ops::ControlFlow; | |||
There was a problem hiding this comment.
Re-exporting a standard library type is somewhat unusual, could you change the use sites to import std::ops::ControlFlow instead?
scottmcm
approved these changes
Sep 12, 2020
There was a problem hiding this comment.
Thanks @NoraCodes! I agree with morse's nit, then LGTM after that.
9 tasks
jyn514
added
requires-nightly
camelid
added
S-waiting-on-author
|
@NoraCodes It looks like this is very close to being ready to merge! Could you address #76614 (comment)? |
|
Will do, apologies for taking so long on this. |
|
No worries :) |
|
Finally actually got around to setting up a Rust dev environment on my personal machine. 😅 |
|
Thanks, @NoraCodes! @bors r+ rollup=iffy |
|
📌 Commit a41795650c73a412a79aef06e71d068e2b707d8a has been approved by |
bors
added
S-waiting-on-bors
|
@NoraCodes This conflicted with #78200, you'll have to rebase to merge this PR. |
LeSeulArtichaut
added
S-waiting-on-author
This allows ControlFlow<BreakType> which is much more ergonomic for common iterator combinator use cases.
scottmcm
force-pushed
the
nora/control_flow_enum
branch
from
a417956 to
bc23179
Compare
|
Rebased. @bors r+ |
|
📌 Commit bc23179 has been approved by |
|
🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 24, 2020
…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`
3 tasks
Merged
Mark-Simulacrum
added
the
beta-accepted
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 15, 2020
…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
23 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows
ControlFlow<BreakType>which is much more ergonomic for common iterator combinator use cases.Addresses one component of #75744