Skip to content

only replace the intended comma in pattern suggestions #147245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 5 commits into from
Oct 4, 2025
Merged

only replace the intended comma in pattern suggestions #147245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4735c21
Fix diagnostics str::replace comma to bar
A4-Tacks Jul 2, 2025
a08228d
bless tests
karolzwolak Sep 27, 2025
934ad74
regression test
karolzwolak Oct 1, 2025
5a8f963
fix wording; we're replacing coma with a bar
karolzwolak Oct 2, 2025
d1d7b94
bring back plural 'alternatives' in suggestion message
karolzwolak Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
bring back plural 'alternatives' in suggestion message
  • Loading branch information
@karolzwolak
karolzwolak committed Oct 2, 2025
commit d1d7b9472a18780499162b4a91beea729bc2c13b
2 changes: 1 addition & 1 deletion compiler/rustc_parse/src/parser/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2961,7 +2961,7 @@ impl<'a> Parser<'a> {
if let CommaRecoveryMode::EitherTupleOrPipe = rt {
err.span_suggestion(
comma_span,
"...or a vertical bar to match on alternative",
"...or a vertical bar to match on alternatives",
" |",
Applicability::MachineApplicable,
);
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ help: try adding parentheses to match on a tuple...
|
LL | (Nucleotide::Adenine, Nucleotide::Cytosine, _) => true
| + +
help: ...or a vertical bar to match on alternative
help: ...or a vertical bar to match on alternatives
|
LL - Nucleotide::Adenine, Nucleotide::Cytosine, _ => true
LL + Nucleotide::Adenine | Nucleotide::Cytosine, _ => true
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/feature-gates/feature-gate-never_patterns.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ help: try adding parentheses to match on a tuple...
|
LL | (Some(_),)
| + +
help: ...or a vertical bar to match on alternative
help: ...or a vertical bar to match on alternatives
|
LL - Some(_),
LL + Some(_) |
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/parser/match-arm-without-body.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ help: try adding parentheses to match on a tuple...
|
LL | (Some(_),)
| + +
help: ...or a vertical bar to match on alternative
help: ...or a vertical bar to match on alternatives
|
LL - Some(_),
LL + Some(_) |
Expand All @@ -36,7 +36,7 @@ LL |
LL |
LL ~ _) => {}
|
help: ...or a vertical bar to match on alternative
help: ...or a vertical bar to match on alternatives
|
LL - Some(_),
LL + Some(_) |
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/suggestions/only-replace-intended-coma-not-all-in-pattern.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ help: try adding parentheses to match on a tuple...
|
LL | (Foo { x: 2, ch: ',' }, Foo { x: 3, ch: '@' }) => (),
| + +
help: ...or a vertical bar to match on alternative
help: ...or a vertical bar to match on alternatives
|
LL - Foo { x: 2, ch: ',' }, Foo { x: 3, ch: '@' } => (),
LL + Foo { x: 2, ch: ',' } | Foo { x: 3, ch: '@' } => (),
Expand Down
Loading