Check opaques for mismatch during writeback #111853
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
S-waiting-on-review
compiler-errors
commented
May 23, 2023
| fcx, | ||
| typeck_results: ty::TypeckResults::new(owner), | ||
| body, | ||
| rustc_dump_user_substs, | ||
| }; | ||
|
|
||
| // HACK: We specifically don't want the (opaque) error from tainting our |
There was a problem hiding this comment.
This hack should be fixed by #111863 actually. I can remove it or fix it in that PR, whichever one lands first.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2023
Rollup of 6 pull requests Successful merges: - rust-lang#111461 (Fix symbol conflict diagnostic mistakenly being shown instead of missing crate diagnostic) - rust-lang#111579 (Also assume wrap-around discriminants in `as` MIR building) - rust-lang#111704 (Remove return type sized check hack from hir typeck) - rust-lang#111853 (Check opaques for mismatch during writeback) - rust-lang#111854 (rustdoc: clean up `settings.css`) - rust-lang#111860 (Don't ICE if method receiver fails to unify with `arbitrary_self_types`) 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.
Revive #111705.
I realized that we don't need to put any substs in the writeback results since all of the hidden types have already been remapped. See the comment in
compiler/rustc_middle/src/ty/typeck_results.rs, which should make that clear for other explorers of the codebase.Additionally, we need to do some diagnostic stashing because the diagnostics we produce during HIR typeck is very poor and we should prefer the diagnostic that comes from MIR, if we have one.
r? @oli-obk