Use correct substs in enum discriminant cast #98429
Merged
Conversation
This file contains 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
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
b-naber
force-pushed
the
use-correct-substs-discriminant-cast
branch
from
9ce21ee
to
2e3221a
Compare
lcnr
reviewed
Jun 24, 2022
Comment on lines
234
to
237
| Some(did) => { | ||
| // in case we are offsetting from a computed discriminant | ||
| // and not the beginning of discriminants (which is always `0`) | ||
|
|
There was a problem hiding this comment.
Suggested change
| Some(did) => { | |
| // in case we are offsetting from a computed discriminant | |
| // and not the beginning of discriminants (which is always `0`) | |
| // in case we are offsetting from a computed discriminant | |
| // and not the beginning of discriminants (which is always `0`) | |
| Some(did) => { |
| }; | ||
|
|
||
| let res = self.typeck_results().qpath_res(qpath, source.hir_id); | ||
| let (discr_did, discr_offset, discr_ty, substs) = { |
There was a problem hiding this comment.
why use that let here instead of keeping the original variables in scope
Comment on lines
207
to
211
| DefKind::Ctor(CtorOf::Variant, CtorKind::Const), | ||
| variant_ctor_id, | ||
| ) = res else { | ||
| return ExprKind::Cast { source: self.mirror_expr(source)}; | ||
| }; |
There was a problem hiding this comment.
wrong indentation, rustfmt doesn't work for let else for now
There was a problem hiding this comment.
hm did call ./x.py fmt this time
There was a problem hiding this comment.
yes, but rustfmt does not work, you have to manually fix indentation for now
lcnr
reviewed
Jun 24, 2022
Comment on lines
205
to
207
| let ty::Adt(adt_def, substs) = ty.kind() else { | ||
| return ExprKind::Cast { source: self.mirror_expr(source)}; | ||
| }; |
There was a problem hiding this comment.
Do you mean the formatting here? As I said this is what x.py formats this to. We also don't get any tidy check failure.
There was a problem hiding this comment.
yes,
As I said this is what x.py formats this to. We also don't get any tidy check failure.
which is happening because rustfmt ignores let else for now. It just keeps the formatting from the user. You can change the formatting of let else to pretty much whatever you want and ./x.py fmt won't change it or complain
lcnr
reviewed
Jun 24, 2022
| @@ -0,0 +1,10 @@ | |||
| //build-pass | |||
There was a problem hiding this comment.
Suggested change
| //build-pass | |
| // build-pass |
|
@bors r+ |
|
📌 Commit bf48b62 has been approved by |
bors
added
S-waiting-on-bors
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this pull request
Jun 25, 2022
…nant-cast, r=lcnr Use correct substs in enum discriminant cast Fixes rust-lang#97634 r? `@lcnr`
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 25, 2022
…nant-cast, r=lcnr Use correct substs in enum discriminant cast Fixes rust-lang#97634 r? ``@lcnr``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 25, 2022
…askrgr Rollup of 9 pull requests Successful merges: - rust-lang#96412 (Windows: Iterative `remove_dir_all`) - rust-lang#98126 (Mitigate MMIO stale data vulnerability) - rust-lang#98149 (Set relocation_model to Pic on emscripten target) - rust-lang#98194 (Leak pthread_{mutex,rwlock}_t if it's dropped while locked.) - rust-lang#98298 (Point to type parameter definition when not finding variant, method and associated item) - rust-lang#98311 (Reverse folder hierarchy) - rust-lang#98401 (Add tracking issues to `--extern` option docs.) - rust-lang#98429 (Use correct substs in enum discriminant cast) - rust-lang#98431 (Suggest defining variable as mutable on `&mut _` type mismatch in pats) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Fixes #97634
r? @lcnr