Skip to content

Recover suggestions to introduce named lifetime under NLL - #96409

Merged
bors merged 1 commit into
rust-lang:masterfrom
marmeladema:fix-nll-introduce-named-lifetime-suggestion
Apr 28, 2022
Merged

Recover suggestions to introduce named lifetime under NLL#96409
bors merged 1 commit into
rust-lang:masterfrom
marmeladema:fix-nll-introduce-named-lifetime-suggestion

Conversation

@marmeladema

Copy link
Copy Markdown
Contributor

Fixes#96157

r? @jackh726

Built on top of #96385 so only the second commit is relevant

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 25, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 25, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Method moved as a free standing function

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. The note is kind of redundant with the NLL error output, I guess.

@jackh726jackh726 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some nits but overall LGTM

Comment threadcompiler/rustc_borrowck/src/diagnostics/region_errors.rs Outdated
Comment threadcompiler/rustc_borrowck/src/diagnostics/region_errors.rs Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. The note is kind of redundant with the NLL error output, I guess.

@bors

bors commented Apr 27, 2022

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #96459) made this pull request unmergeable. Please resolve the merge conflicts.

@marmeladema
marmelademaforce-pushed the fix-nll-introduce-named-lifetime-suggestion branch from cee7629 to 2c94218CompareApril 27, 2022 20:36
@jackh726

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Apr 28, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 2c94218 has been approved by jackh726

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 28, 2022
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
Fixesrust-lang#96157
r? `@jackh726`
Built on top of rust-lang#96385 so only the second commit is relevant
@Dylan-DPCDylan-DPC mentioned this pull request Apr 28, 2022
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
Fixesrust-lang#96157
r? ``@jackh726``
Built on top of rust-lang#96385 so only the second commit is relevant
@Dylan-DPCDylan-DPC mentioned this pull request Apr 28, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Apr 28, 2022
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
@bors
bors merged commit cbfbc3b into rust-lang:masterApr 28, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 28, 2022
@marmeladema
marmeladema deleted the fix-nll-introduce-named-lifetime-suggestion branch April 28, 2022 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[NLL] Loss of suggestion to introduce a named lifetime parameter

5 participants

@marmeladema@bors@jackh726@rust-highfive@rustbot