Properly restore snapshot when failing to recover parsing ternary #117212

clubby789 · 2023-10-26T11:15:00Z

If the recovery parsed an expression, then failed to eat a :, it would return false without restoring the snapshot. Fix this by always restoring the snapshot when returning false.

Draft for now because I'd like to try and improve this recovery further.

Fixes #117208

rustbot · 2023-10-26T11:15:08Z

r? @compiler-errors

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

clubby789 · 2023-10-26T11:37:27Z

Because the precedence doesn't match up and the expression gets parsed as a Try, recovering like this caused a lot of irrelevant spam. Return an Err instead to make the diagnostics more useful, since I don't think there's a reasonable way to recover this properly/provide an if/else suggestion.

compiler/rustc_parse/src/parser/diagnostics.rs

compiler-errors · 2023-10-27T14:47:47Z

@bors r+ rollup

bors · 2023-10-27T14:47:49Z

📌 Commit e81a5c6 has been approved by compiler-errors

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#116834 (Remove `rustc_symbol_mangling/messages.ftl`.) - rust-lang#117212 (Properly restore snapshot when failing to recover parsing ternary) - rust-lang#117246 (Fix ICE: Restrict param constraint suggestion) - rust-lang#117247 (NVPTX: Allow PassMode::Direct for ptx kernels for now) - rust-lang#117270 (Hide internal methods from documentation) - rust-lang#117281 (std::thread : add SAFETY comment) - rust-lang#117287 (fix miri target information for Test step) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117212 - clubby789:fix-ternary-recover, r=compiler-errors Properly restore snapshot when failing to recover parsing ternary If the recovery parsed an expression, then failed to eat a `:`, it would return `false` without restoring the snapshot. Fix this by always restoring the snapshot when returning `false`. Draft for now because I'd like to try and improve this recovery further. Fixes rust-lang#117208

Properly restore snapshot when failing to recover parsing ternary

041f031

rustbot assigned compiler-errors Oct 26, 2023

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. labels Oct 26, 2023

clubby789 marked this pull request as ready for review October 26, 2023 11:36

compiler-errors reviewed Oct 26, 2023

View reviewed changes

compiler/rustc_parse/src/parser/diagnostics.rs Outdated Show resolved Hide resolved

Recover ternary expression as error

e81a5c6

rust-cloud-vms bot force-pushed the fix-ternary-recover branch from cddf088 to e81a5c6 Compare October 26, 2023 23:04

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 27, 2023

matthiaskrgr mentioned this pull request Oct 27, 2023

Rollup of 7 pull requests #117294

Merged

bors merged commit b229537 into rust-lang:master Oct 27, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 27, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Properly restore snapshot when failing to recover parsing ternary #117212

Properly restore snapshot when failing to recover parsing ternary #117212

clubby789 commented Oct 26, 2023

rustbot commented Oct 26, 2023

clubby789 commented Oct 26, 2023 •

edited

Loading

compiler-errors commented Oct 27, 2023

bors commented Oct 27, 2023

Properly restore snapshot when failing to recover parsing ternary #117212

Properly restore snapshot when failing to recover parsing ternary #117212

Conversation

clubby789 commented Oct 26, 2023

rustbot commented Oct 26, 2023

clubby789 commented Oct 26, 2023 • edited Loading

compiler-errors commented Oct 27, 2023

bors commented Oct 27, 2023

clubby789 commented Oct 26, 2023 •

edited

Loading