Recover form missing expression in for loop

[obeis]

Close #78537
r? @estebank

[compiler-errors]

Esteban is out for a few weeks. r? @compiler-errors

[rustbot]

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

[estebank]

@bors r=estebank,compiler-errors

[bors]

📌 Commit eb2599899b4c027b6aab01070264efdb8efc0b30 has been approved by estebank,compiler-errors

It is now in the queue for this repository.

[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 for-missing-iterator (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 for-missing-iterator --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 compiler/rustc_parse/src/parser/expr.rs
CONFLICT (content): Merge conflict in compiler/rustc_parse/src/parser/expr.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[compiler-errors]

@bors r=estebank,compiler-errors

[bors]

📌 Commit 17b6bd6 has been approved by estebank,compiler-errors

It is now in the queue for this repository.

[bors]

⌛ Testing commit 17b6bd6 with merge 75a0be9...

[bors]

☀️ Test successful - checks-actions
Approved by: estebank,compiler-errors
Pushing 75a0be9 to master...

[rust-timer]

Finished benchmarking commit (75a0be9): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.3%	[-0.3%, -0.3%]	2
Improvements ✅ (secondary)	-1.0%	[-1.3%, -0.6%]	7
All ❌✅ (primary)	-0.3%	[-0.3%, -0.3%]	2

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.5%	[1.5%, 1.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	1.5%	[1.5%, 1.5%]	1

Cycles

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