Use structured suggestion for #113174

[estebank]

When encountering a for loop that is rejected by the borrow checker because it is being advanced within its body, provide a structured suggestion for while let Some(pat) = iter.next().

[rustbot]

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

[oli-obk]

This entire file needs a serious overhaul (it's immense and unstructured, and not using structured diagnostics). At some point we need to stop adding to it until that is done 😆

[oli-obk]

@bors r+ rollup

[bors]

📌 Commit 6c1ba4a has been approved by oli-obk

It is now in the queue for this repository.

[bors]

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

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout sugg-113174 (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self sugg-113174 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/ui/suggestions/issue-102972.stderr
CONFLICT (content): Merge conflict in tests/ui/suggestions/issue-102972.stderr
Auto-merging compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout sugg-113174 (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self sugg-113174 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/ui/suggestions/issue-102972.stderr
CONFLICT (content): Merge conflict in tests/ui/suggestions/issue-102972.stderr
Auto-merging compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
CONFLICT (content): Merge conflict in compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout sugg-113174 (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self sugg-113174 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/ui/suggestions/issue-102972.stderr
CONFLICT (content): Merge conflict in tests/ui/suggestions/issue-102972.stderr
Auto-merging compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
CONFLICT (content): Merge conflict in compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Automatic merge failed; fix conflicts and then commit the result.

[estebank]

@bors r=oli-obk

[bors]

📌 Commit 9d2eb66 has been approved by oli-obk

It is now in the queue for this repository.

[bors]

⌛ Testing commit 9d2eb66 with merge 3d575a2...

[bors]

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 3d575a2 to master...

[rust-timer]

Finished benchmarking commit (3d575a2): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results

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)	1.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	4.8%	[4.8%, 4.8%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[1.1%, 1.1%]	1

Cycles

Results

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)	8.9%	[8.9%, 8.9%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 628.721s -> 628.393s (-0.05%)
Artifact size: 271.30 MiB -> 271.29 MiB (-0.01%)