Recover parentheses in range patterns #119397

ShE3py · 2023-12-28T22:29:09Z

Before:

match n {
    (0).. => (),
    _ => ()
}

error: expected one of `=>`, `if`, or `|`, found `..`
 --> src/lib.rs:3:12
  |
3 |         (0).. => (),
  |            ^^ expected one of `=>`, `if`, or `|`

After:

error: range pattern bounds cannot have parentheses
 --> main.rs:3:5
  |
3 |     (0).. => (),
  |     ^ ^
  |
help: remove these parentheses
  |
3 -     (0).. => (),
3 +     0.. => (),
  |

This sets the groundwork for #118625, which will extend the recovery to expressions like (0 + 1).. where users may tend to add parentheses to avoid dealing with precedence.

@rustbot label +A-parser +A-patterns +A-diagnostics

rustbot · 2023-12-28T22:29:17Z

r? @TaKO8Ki

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

fmease

I'm pretty sure this needs .may_recover() checks in some places not to regress code like:

macro_rules! m {
    ($pat:pat) => {};
    (($l:literal)..) => {};
}

fn main() {
    m!((0)..);
}

The code above now fails to compile or am I mistaken?

compiler/rustc_parse/src/parser/pat.rs

compiler/rustc_parse/src/errors.rs

compiler/rustc_parse/src/parser/pat.rs

tests/ui/half-open-range-patterns/range_pat_interactions2.rs

fmease · 2023-12-30T00:50:39Z

r? fmease

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

ShE3py · 2023-12-31T14:39:37Z

@rustbot ready

fmease

Thanks for applying my suggestions!

I've had a think about #119397 (comment) again and while that diagnostic (expected `)`, found `+`) isn't ideal, you plan on fixing that soon anyway . Now, the latest version of your PR contains two ad hoc diagnostics (unexpected token: `(` ) which aren't ideal either.

So let's go back to bailing out early with ? if we fail to parse bound in parse_pat_range_end and to expect'ing ) instead of eat_noexpect'ing to eliminate both occurrences of struct_span_err.

After, that this PR is good to go! Sorry for taking a while to respond. I'm excited to see you improving the parse errors for patterns! ❤️

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

fmease · 2024-01-03T15:48:04Z

@bors r+ rollup

bors · 2024-01-03T15:48:07Z

📌 Commit 4e0badd has been approved by fmease

It is now in the queue for this repository.

bors · 2024-01-03T15:48:07Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

…=fmease Recover parentheses in range patterns Before: ```rs match n { (0).. => (), _ => () } ``` ``` error: expected one of `=>`, `if`, or `|`, found `..` --> src/lib.rs:3:12 | 3 | (0).. => (), | ^^ expected one of `=>`, `if`, or `|` ``` After: ``` error: range pattern bounds cannot have parentheses --> main.rs:3:5 | 3 | (0).. => (), | ^ ^ | help: remove these parentheses | 3 - (0).. => (), 3 + 0.. => (), | ``` This sets the groundwork for rust-lang#118625, which will extend the recovery to expressions like `(0 + 1)..` where users may tend to add parentheses to avoid dealing with precedence. --- `@rustbot` label +A-parser +A-patterns +A-diagnostics

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119184 (Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern`) - rust-lang#119325 (custom mir: make it clear what the return block is) - rust-lang#119391 (Use Result::flatten in catch_with_exit_code) - rust-lang#119397 (Recover parentheses in range patterns) - rust-lang#119414 (bootstrap: Move -Clto= setting from Rustc::run to rustc_cargo) - rust-lang#119417 (Uplift some miscellaneous coroutine-specific machinery into `check_closure`) - rust-lang#119527 (don't reexport atomic::ordering via rustc_data_structures, use std import) - rust-lang#119540 (Don't synthesize host effect args inside trait object types) r? `@ghost` `@rustbot` modify labels: rollup

…=fmease Recover parentheses in range patterns Before: ```rs match n { (0).. => (), _ => () } ``` ``` error: expected one of `=>`, `if`, or `|`, found `..` --> src/lib.rs:3:12 | 3 | (0).. => (), | ^^ expected one of `=>`, `if`, or `|` ``` After: ``` error: range pattern bounds cannot have parentheses --> main.rs:3:5 | 3 | (0).. => (), | ^ ^ | help: remove these parentheses | 3 - (0).. => (), 3 + 0.. => (), | ``` This sets the groundwork for rust-lang#118625, which will extend the recovery to expressions like `(0 + 1)..` where users may tend to add parentheses to avoid dealing with precedence. --- ``@rustbot`` label +A-parser +A-patterns +A-diagnostics

…mpiler-errors Rollup of 10 pull requests Successful merges: - rust-lang#118521 (Enable address sanitizer for MSVC targets using INFERASANLIBS linker flag) - rust-lang#119026 (std::net::bind using -1 for openbsd which in turn sets it to somaxconn.) - rust-lang#119195 (Make named_asm_labels lint not trigger on unicode and trigger on format args) - rust-lang#119204 (macro_rules: Less hacky heuristic for using `tt` metavariable spans) - rust-lang#119362 (Make `derive(Trait)` suggestion more accurate) - rust-lang#119397 (Recover parentheses in range patterns) - rust-lang#119414 (bootstrap: Move -Clto= setting from Rustc::run to rustc_cargo) - rust-lang#119417 (Uplift some miscellaneous coroutine-specific machinery into `check_closure`) - rust-lang#119540 (Don't synthesize host effect args inside trait object types) - rust-lang#119555 (Add codegen test for RVO on MaybeUninit) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#118521 (Enable address sanitizer for MSVC targets using INFERASANLIBS linker flag) - rust-lang#119026 (std::net::bind using -1 for openbsd which in turn sets it to somaxconn.) - rust-lang#119195 (Make named_asm_labels lint not trigger on unicode and trigger on format args) - rust-lang#119204 (macro_rules: Less hacky heuristic for using `tt` metavariable spans) - rust-lang#119362 (Make `derive(Trait)` suggestion more accurate) - rust-lang#119397 (Recover parentheses in range patterns) - rust-lang#119417 (Uplift some miscellaneous coroutine-specific machinery into `check_closure`) - rust-lang#119539 (Fix typos) - rust-lang#119540 (Don't synthesize host effect args inside trait object types) - rust-lang#119555 (Add codegen test for RVO on MaybeUninit) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119397 - ShE3py:pat-range-paren-recovery, r=fmease Recover parentheses in range patterns Before: ```rs match n { (0).. => (), _ => () } ``` ``` error: expected one of `=>`, `if`, or `|`, found `..` --> src/lib.rs:3:12 | 3 | (0).. => (), | ^^ expected one of `=>`, `if`, or `|` ``` After: ``` error: range pattern bounds cannot have parentheses --> main.rs:3:5 | 3 | (0).. => (), | ^ ^ | help: remove these parentheses | 3 - (0).. => (), 3 + 0.. => (), | ``` This sets the groundwork for rust-lang#118625, which will extend the recovery to expressions like `(0 + 1)..` where users may tend to add parentheses to avoid dealing with precedence. --- ```@rustbot``` label +A-parser +A-patterns +A-diagnostics

rustbot assigned TaKO8Ki Dec 28, 2023

fmease reviewed Dec 28, 2023

View reviewed changes

ShE3py force-pushed the pat-range-paren-recovery branch from d9e140e to 6b71d23 Compare December 29, 2023 10:18

This comment has been minimized.

Sign in to view

ShE3py force-pushed the pat-range-paren-recovery branch from 6b71d23 to d114f47 Compare December 29, 2023 10:34

fmease requested changes Dec 30, 2023

View reviewed changes

rustbot assigned fmease and unassigned TaKO8Ki Dec 30, 2023

fmease 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 30, 2023

ShE3py added a commit to ShE3py/rust that referenced this pull request Dec 30, 2023

Refactor PR rust-lang#119397

1ec28f8

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

ShE3py force-pushed the pat-range-paren-recovery branch from 1ec28f8 to 04128be Compare December 30, 2023 19:54

ShE3py added a commit to ShE3py/rust that referenced this pull request Dec 30, 2023

Refactor PR rust-lang#119397

04128be

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

ShE3py force-pushed the pat-range-paren-recovery branch from 04128be to 9566efe Compare December 31, 2023 12:39

ShE3py added a commit to ShE3py/rust that referenced this pull request Dec 31, 2023

Refactor PR rust-lang#119397 & improve pat range bound paren recovery

9566efe

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 31, 2023

fmease approved these changes Jan 3, 2024

View reviewed changes

Recover parentheses in range patterns

4e0badd

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

ShE3py force-pushed the pat-range-paren-recovery branch from 9566efe to 4e0badd Compare January 3, 2024 14:55

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 Jan 3, 2024

matthiaskrgr mentioned this pull request Jan 3, 2024

Rollup of 8 pull requests #119557

Closed

compiler-errors mentioned this pull request Jan 4, 2024

Rollup of 10 pull requests #119565

Closed

matthiaskrgr mentioned this pull request Jan 4, 2024

Rollup of 10 pull requests #119569

Merged

bors merged commit 3325ba6 into rust-lang:master Jan 4, 2024
11 checks passed

rustbot added this to the 1.77.0 milestone Jan 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Recover parentheses in range patterns #119397

Recover parentheses in range patterns #119397

ShE3py commented Dec 28, 2023

rustbot commented Dec 28, 2023

fmease left a comment

This comment has been minimized.

fmease commented Dec 30, 2023

ShE3py commented Dec 31, 2023

fmease left a comment •

edited

Loading

fmease commented Jan 3, 2024

bors commented Jan 3, 2024

bors commented Jan 3, 2024

Recover parentheses in range patterns #119397

Recover parentheses in range patterns #119397

Conversation

ShE3py commented Dec 28, 2023

rustbot commented Dec 28, 2023

fmease left a comment

Choose a reason for hiding this comment

This comment has been minimized.

fmease commented Dec 30, 2023

ShE3py commented Dec 31, 2023

fmease left a comment • edited Loading

Choose a reason for hiding this comment

fmease commented Jan 3, 2024

bors commented Jan 3, 2024

bors commented Jan 3, 2024

fmease left a comment •

edited

Loading