Normalize in infcx instead of globally for Option::as_deref suggestion
#112303
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
The projection may contain inference variables. These inference variables are local to the local inference context. Using `tcx.normalize_erasing_regions` doesn't work here because this method is global and does not have access to the inference context. It's therefore unable to deal with the inference variables. We normalize in the local inference context instead, which knowns about the inference variables.
rustbot
added
S-waiting-on-review
Noratrieb
commented
Jun 5, 2023
| LL - fn generic_ref<T>(_: &T) -> Option<()> { | ||
| LL + fn generic_ref<T>(_: T) -> Option<()> { | ||
| | | ||
| help: call `Option::as_deref()` first |
There was a problem hiding this comment.
This now shows up because of the first commit :)
compiler-errors
approved these changes
Jun 5, 2023
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 5, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#112081 (Avoid ICE on `#![doc(test(...)]` with literal parameter) - rust-lang#112196 (Resolve vars in result from `scrape_region_constraints`) - rust-lang#112303 (Normalize in infcx instead of globally for `Option::as_deref` suggestion) - rust-lang#112316 (Ensure space is inserted after keyword in `unused_delims`) - rust-lang#112318 (Merge method, type and const object safety checks) - rust-lang#112322 (Don't mention `IMPLIED_BOUNDS_ENTAILMENT` if signatures reference error) Failed merges: - rust-lang#112251 (rustdoc: convert `if let Some()` that always matches to variable) 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 #112293
The projection may contain inference variables. These inference variables are local to the local inference context. Using
tcx.normalize_erasing_regionsdoesn't work here because this method is global and does not have access to the inference context. It's therefore unable to deal with the inference variables. We normalize in the local inference context instead, which knowns about the inference variables.The test looks a little different than the issue example, I made it more minimal and verified that it still ICEs on nightly.
Also contains a drive-by fix to properly compare the types.
r? @compiler-errors