Recover suggestions to introduce named lifetime under NLL #96409
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
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
marmeladema
commented
Apr 25, 2022
| | hir::Node::TraitItem(&hir::TraitItem { ref generics, .. }) | ||
| | hir::Node::ImplItem(&hir::ImplItem { ref generics, .. }) => generics, | ||
| _ => return, | ||
| pub fn suggest_adding_lifetime_params<'tcx>( |
There was a problem hiding this comment.
Method moved as a free standing function
marmeladema
commented
Apr 25, 2022
| self.suggest_adding_lifetime_params(sub, ty_sup, ty_sub, &mut err); | ||
| if suggest_adding_lifetime_params(self.tcx(), sub, ty_sup, ty_sub, &mut err) { | ||
| err.note("each elided lifetime in input position becomes a distinct lifetime"); | ||
| } |
There was a problem hiding this comment.
Note was originally in suggest_adding_lifetime_params but by moving it here we can avoid having the note under NLL.
However if we do want the note, I can just move it back to where it comes from
There was a problem hiding this comment.
Hmm. The note is kind of redundant with the NLL error output, I guess.
jackh726
requested changes
Apr 26, 2022
| self.suggest_adding_lifetime_params(sub, ty_sup, ty_sub, &mut err); | ||
| if suggest_adding_lifetime_params(self.tcx(), sub, ty_sup, ty_sub, &mut err) { | ||
| err.note("each elided lifetime in input position becomes a distinct lifetime"); | ||
| } |
There was a problem hiding this comment.
Hmm. The note is kind of redundant with the NLL error output, I guess.
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/different_lifetimes.rs
Outdated
Show resolved
Hide resolved
|
☔ The latest upstream changes (presumably #96459) made this pull request unmergeable. Please resolve the merge conflicts. |
marmeladema
force-pushed
the
fix-nll-introduce-named-lifetime-suggestion
branch
from
cee7629 to
2c94218
Compare
|
@bors r+ |
|
📌 Commit 2c94218 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 28, 2022
…-lifetime-suggestion, r=jackh726 Recover suggestions to introduce named lifetime under NLL Fixes rust-lang#96157 r? `@jackh726` Built on top of rust-lang#96385 so only the second commit is relevant
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 28, 2022
…-lifetime-suggestion, r=jackh726 Recover suggestions to introduce named lifetime under NLL Fixes rust-lang#96157 r? ``@jackh726`` Built on top of rust-lang#96385 so only the second commit is relevant
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 28, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#95312 (Ensure that `'_` and GAT yields errors) - rust-lang#96405 (Migrate ambiguous plus diagnostic to the new derive macro) - rust-lang#96409 (Recover suggestions to introduce named lifetime under NLL) - rust-lang#96433 (rustc_ast: Harmonize delimiter naming with `proc_macro::Delimiter`) - rust-lang#96480 (Fixed grammatical error in example comment) 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 #96157
r? @jackh726
Built on top of #96385 so only the second commit is relevant