Fix feature = "nightly" in the new trait solver
#126649
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
rustbot
added
S-waiting-on-review
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
compiler-errors
commented
Jun 18, 2024
lcnr
reviewed
Jun 19, 2024
Comment on lines
+307
to
+310
| // FIXME: let_chains | ||
| let kind = kind_ty.to_opt_closure_kind(); | ||
| let coroutine_ty = if kind.is_some() && !args.tupled_upvars_ty().is_ty_var() { | ||
| let closure_kind = kind.unwrap(); |
There was a problem hiding this comment.
Suggested change
| // FIXME: let_chains | |
| let kind = kind_ty.to_opt_closure_kind(); | |
| let coroutine_ty = if kind.is_some() && !args.tupled_upvars_ty().is_ty_var() { | |
| let closure_kind = kind.unwrap(); | |
| let coroutine_ty = if let Some(kind) = kind_ty.to_opt_closure_kind().filter(|_| !args.tupled_upvars_ty().is_ty_var()) { |
There was a problem hiding this comment.
I feel like this is so much harder to read. I'd really rather unwrap, or restructure the whole block to just be nested ifs.
|
|
||
| // FIXME: let_chains | ||
| let kind = kind_ty.to_opt_closure_kind(); | ||
| let coroutine_ty = if kind.is_some() && !args.tupled_upvars_ty().is_ty_var() { |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 20, 2024
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted) - rust-lang#126649 (Fix `feature = "nightly"` in the new trait solver) - rust-lang#126652 (Clarify that anonymous consts still do introduce a new scope) - rust-lang#126703 (reword the hint::blackbox non-guarantees) - rust-lang#126708 (Minimize `can_begin_literal_maybe_minus` usage) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 20, 2024
Rollup merge of rust-lang#126649 - compiler-errors:nightly, r=lcnr Fix `feature = "nightly"` in the new trait solver r? lcnr
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
r? lcnr