Try to point out when edition 2024 lifetime capture rules cause borrowck issues #131186

compiler-errors · 2024-10-03T04:48:49Z

Lifetime capture rules in 2024 are modified to capture more lifetimes, which sometimes lead to some non-local borrowck errors. This PR attempts to link these back together with a useful note pointing out the capture rule changes.

This is not a blocking concern, but I'd appreciate feedback (though, again, I'd like to stress that I don't want to block this PR on this): I'm worried about this note drowning in the sea of other diagnostics that borrowck emits. I was tempted to change the level of the note to .span_warn just so it would show up in a different color. Thoughts?

Fixes #130545

Opening as a draft first since it's stacked on #131183.
r? @ghost

estebank · 2024-10-03T18:48:34Z

compiler/rustc_borrowck/src/diagnostics/opaque_suggestions.rs

+                            Applicability::MaybeIncorrect,
+                        );
+                    } else {
+                        diag.span_help(


Why isn't this a structured suggestion? Edit: because it's checking if it's not the current crate, got it.

compiler-errors · 2024-10-04T03:34:26Z

r? @estebank, would you be willing to help out with the wording/etc. here? Otherwise, please feel free to reassign. I know the lifetime logic is kinda sketchy, but after all it's a diagnostic so 🤷

rustbot · 2024-10-04T03:34:29Z

HIR ty lowering was modified

cc @fmease

compiler-errors · 2024-10-04T03:36:44Z

Let's see the cost of the cross-crate encoding of opaque origin.

@bors try @rust-timer

bors · 2024-10-04T03:43:16Z

⌛ Trying commit 3b98411 with merge 17a60f6...

…rrowck, r=<try> Try to point out when edition 2024 lifetime capture rules cause borrowck issues Lifetime capture rules in 2024 are modified to capture more lifetimes, which sometimes lead to some non-local borrowck errors. This PR attempts to link these back together with a useful note pointing out the capture rule changes. This is not a blocking concern, but I'd appreciate feedback (though, again, I'd like to stress that I don't want to block this PR on this): I'm worried about this note drowning in the sea of other diagnostics that borrowck emits. I was tempted to change the level of the note to `.span_warn` just so it would show up in a different color. Thoughts? Fixes rust-lang#130545 Opening as a draft first since it's stacked on rust-lang#131183. r? `@ghost`

bors · 2024-10-04T05:29:19Z

☀️ Try build successful - checks-actions
Build commit: 17a60f6 (17a60f6d33bf58ecd032c2545d56965569adb3e8)

compiler-errors · 2024-10-04T13:05:52Z

ugh lol

@rust-timer build 17a60f6

rust-timer · 2024-10-04T14:25:17Z

Finished benchmarking commit (17a60f6): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -2.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-3.0%, -2.1%]	4
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary 3.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.9%	[3.2%, 4.8%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

Results (primary 0.1%, secondary 0.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.0%, 0.3%]	32
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.0%, 0.3%]	32

Bootstrap: 774.169s -> 772.785s (-0.18%)
Artifact size: 342.02 MiB -> 342.06 MiB (0.01%)

bors · 2024-10-24T21:10:52Z

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

estebank

r=me after rebase

estebank · 2024-10-25T02:08:36Z

tests/ui/impl-trait/precise-capturing/migration-note.stderr

+LL |     println!("{a}");
+   |               --- immutable borrow later used here
+   |
+note: this call may capture more lifetimes since Rust 2024 has adjusted `impl Trait` lifetime capture rules


What do you think of the following?

Suggested change

note: this call may capture more lifetimes since Rust 2024 has adjusted `impl Trait` lifetime capture rules

note: this call may be capturing more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules

estebank · 2024-10-25T02:09:31Z

tests/ui/impl-trait/precise-capturing/migration-note.stderr

+   |
+LL |     let a = display_len(&x);
+   |             ^^^^^^^^^^^^^^^
+help: add a `use<..>` precise capturing bound to avoid overcapturing


I'd let the suggestion show the syntax and leave the text easier to read

Suggested change

help: add a `use<..>` precise capturing bound to avoid overcapturing

help: add a precise capturing bound to avoid overcapturing in Rust 2024 edition

I think saying "in Rust 2024" is redundant (that's the current edition enabled) and also going to be wrong as soon as we bump the edition further. I'll leave out the use<..> part tho.

compiler-errors · 2024-10-30T03:20:34Z

@bors r=estebank

bors · 2024-10-30T03:20:38Z

📌 Commit b2fa80e has been approved by estebank

It is now in the queue for this repository.

…rrowck, r=estebank Try to point out when edition 2024 lifetime capture rules cause borrowck issues Lifetime capture rules in 2024 are modified to capture more lifetimes, which sometimes lead to some non-local borrowck errors. This PR attempts to link these back together with a useful note pointing out the capture rule changes. This is not a blocking concern, but I'd appreciate feedback (though, again, I'd like to stress that I don't want to block this PR on this): I'm worried about this note drowning in the sea of other diagnostics that borrowck emits. I was tempted to change the level of the note to `.span_warn` just so it would show up in a different color. Thoughts? Fixes rust-lang#130545 Opening as a draft first since it's stacked on rust-lang#131183. r? `@ghost`

bors · 2024-10-30T13:10:07Z

⌛ Testing commit b2fa80e with merge 3e04a23...

bors · 2024-10-30T17:13:40Z

💔 Test failed - checks-actions

compiler-errors · 2024-10-30T17:14:34Z

@bors retry

bors · 2024-10-31T01:27:49Z

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

…wck issues

compiler-errors · 2024-10-31T01:54:40Z

@bors r=estebank

bors · 2024-10-31T01:54:42Z

📌 Commit c145779 has been approved by estebank

It is now in the queue for this repository.

bors · 2024-10-31T03:36:10Z

⌛ Testing commit c145779 with merge c8b8378...

bors · 2024-10-31T06:21:50Z

☀️ Test successful - checks-actions
Approved by: estebank
Pushing c8b8378 to master...

rust-timer · 2024-10-31T07:43:24Z

Finished benchmarking commit (c8b8378): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.7%	[-0.7%, -0.7%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -1.8%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.8%	[-1.8%, -1.8%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results (primary 0.1%, secondary 0.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.0%, 0.3%]	32
Regressions ❌ (secondary)	0.2%	[0.2%, 0.3%]	11
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.0%, 0.3%]	32

Bootstrap: 782.954s -> 783.744s (0.10%)
Artifact size: 333.54 MiB -> 333.54 MiB (-0.00%)

Dont suggest `use<impl Trait>` when we have an edition-2024-related borrowck issue rust-lang#131186 implements some machinery to detect in borrowck when we may have RPIT overcaptures due to edition 2024, and suggests adding `+ use<'a, T>` to go back to the edition 2021 capture rules. However, we weren't filtering out cases when there are APITs in scope. This PR implements a more sophisticated diagnostic where we will suggest turning any APITs in scope into type parameters, and applies this to both the borrowck error note, and to the `impl_trait_overcaptures` migration lint. cc rust-lang#132809

Rollup merge of rust-lang#132816 - compiler-errors:2024-apit, r=jieyouxu Dont suggest `use<impl Trait>` when we have an edition-2024-related borrowck issue rust-lang#131186 implements some machinery to detect in borrowck when we may have RPIT overcaptures due to edition 2024, and suggests adding `+ use<'a, T>` to go back to the edition 2021 capture rules. However, we weren't filtering out cases when there are APITs in scope. This PR implements a more sophisticated diagnostic where we will suggest turning any APITs in scope into type parameters, and applies this to both the borrowck error note, and to the `impl_trait_overcaptures` migration lint. cc rust-lang#132809

Dont suggest `use<impl Trait>` when we have an edition-2024-related borrowck issue rust-lang#131186 implements some machinery to detect in borrowck when we may have RPIT overcaptures due to edition 2024, and suggests adding `+ use<'a, T>` to go back to the edition 2021 capture rules. However, we weren't filtering out cases when there are APITs in scope. This PR implements a more sophisticated diagnostic where we will suggest turning any APITs in scope into type parameters, and applies this to both the borrowck error note, and to the `impl_trait_overcaptures` migration lint. cc rust-lang#132809

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 3, 2024

compiler-errors force-pushed the precise-capturing-borrowck branch from fd49086 to 5ade2ea Compare October 3, 2024 04:52

estebank reviewed Oct 3, 2024

View reviewed changes

compiler-errors force-pushed the precise-capturing-borrowck branch from 5ade2ea to 3b98411 Compare October 4, 2024 03:33

compiler-errors marked this pull request as ready for review October 4, 2024 03:34

rustbot assigned estebank Oct 4, 2024

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the precise-capturing-borrowck branch from 3b98411 to 66e10ed Compare October 16, 2024 01:04

This comment has been minimized.

Sign in to view

estebank approved these changes Oct 25, 2024

View reviewed changes

compiler-errors force-pushed the precise-capturing-borrowck branch from 66e10ed to b2fa80e Compare October 25, 2024 16:47

bors 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 Oct 30, 2024

bors mentioned this pull request Oct 30, 2024

Some graphviz tweaks #132346

Merged

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 30, 2024

bors 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 Oct 30, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 31, 2024

compiler-errors added 2 commits October 31, 2024 01:35

Encode cross-crate opaque type origin

e093b82

Try to point out when edition 2024 lifetime capture rules cause borro…

c145779

…wck issues

compiler-errors force-pushed the precise-capturing-borrowck branch from b2fa80e to c145779 Compare October 31, 2024 01:45

bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 31, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 31, 2024

bors merged commit c8b8378 into rust-lang:master Oct 31, 2024
7 checks passed

rustbot added this to the 1.84.0 milestone Oct 31, 2024

This was referenced Nov 9, 2024

Dont suggest use<impl Trait> when we have an edition-2024-related borrowck issue #132816

Merged

2024 No migration for a particular RPIT scenario (async?) #132819

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Try to point out when edition 2024 lifetime capture rules cause borrowck issues #131186

Try to point out when edition 2024 lifetime capture rules cause borrowck issues #131186

compiler-errors commented Oct 3, 2024 •

edited

Loading

estebank Oct 3, 2024 •

edited

Loading

compiler-errors commented Oct 4, 2024

rustbot commented Oct 4, 2024

compiler-errors commented Oct 4, 2024

bors commented Oct 4, 2024

bors commented Oct 4, 2024

compiler-errors commented Oct 4, 2024

This comment has been minimized.

rust-timer commented Oct 4, 2024

This comment has been minimized.

bors commented Oct 24, 2024

estebank left a comment

estebank Oct 25, 2024

estebank Oct 25, 2024

compiler-errors Oct 25, 2024

compiler-errors commented Oct 30, 2024

bors commented Oct 30, 2024

bors commented Oct 30, 2024

This comment has been minimized.

bors commented Oct 30, 2024

compiler-errors commented Oct 30, 2024

bors commented Oct 31, 2024

compiler-errors commented Oct 31, 2024

bors commented Oct 31, 2024

bors commented Oct 31, 2024

bors commented Oct 31, 2024

rust-timer commented Oct 31, 2024

	note: this call may capture more lifetimes since Rust 2024 has adjusted `impl Trait` lifetime capture rules
	note: this call may be capturing more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules

	help: add a `use<..>` precise capturing bound to avoid overcapturing
	help: add a precise capturing bound to avoid overcapturing in Rust 2024 edition

Try to point out when edition 2024 lifetime capture rules cause borrowck issues #131186

Try to point out when edition 2024 lifetime capture rules cause borrowck issues #131186

Conversation

compiler-errors commented Oct 3, 2024 • edited Loading

estebank Oct 3, 2024 • edited Loading

Choose a reason for hiding this comment

compiler-errors commented Oct 4, 2024

rustbot commented Oct 4, 2024

compiler-errors commented Oct 4, 2024

bors commented Oct 4, 2024

bors commented Oct 4, 2024

compiler-errors commented Oct 4, 2024

This comment has been minimized.

rust-timer commented Oct 4, 2024

Overall result: no relevant changes - no action needed

This comment has been minimized.

bors commented Oct 24, 2024

estebank left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

compiler-errors commented Oct 30, 2024

bors commented Oct 30, 2024

bors commented Oct 30, 2024

This comment has been minimized.

bors commented Oct 30, 2024

compiler-errors commented Oct 30, 2024

bors commented Oct 31, 2024

compiler-errors commented Oct 31, 2024

bors commented Oct 31, 2024

bors commented Oct 31, 2024

bors commented Oct 31, 2024

rust-timer commented Oct 31, 2024

Overall result: ✅ improvements - no action needed

compiler-errors commented Oct 3, 2024 •

edited

Loading

estebank Oct 3, 2024 •

edited

Loading