Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix the issue of typo of comma in arm parsing

Browse Source
This commit is contained in:
yukang
2025-05-16 12:38:51 +02:00
parent c79bbfab78
commit 5f8954bc41
4 changed files with 110 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_parse/src/parser/expr.rs
+36 -18
View File
@@ -3311,26 +3311,44 @@ pub(super) fn parse_arm(&mut self) -> PResult<'a, Arm> {
let sm = this.psess.source_map();
if let Ok(expr_lines) = sm.span_to_lines(expr_span)
&& let Ok(arm_start_lines) = sm.span_to_lines(arm_start_span)
&& arm_start_lines.lines[0].end_col == expr_lines.lines[0].end_col
&& expr_lines.lines.len() == 2
{
// We check whether there's any trailing code in the parse span,
// if there isn't, we very likely have the following:
//
// X | &Y => "y"
// | -- - missing comma
// | |
// | arrow_span
// X | &X => "x"
// | - ^^ self.token.span
// | |
// | parsed until here as `"y" & X`
err.span_suggestion_short(
arm_start_span.shrink_to_hi(),
"missing a comma here to end this `match` arm",
",",
Applicability::MachineApplicable,
);
if arm_start_lines.lines[0].end_col == expr_lines.lines[0].end_col {
// We check whether there's any trailing code in the parse span,
// if there isn't, we very likely have the following:
//
// X | &Y => "y"
// | -- - missing comma
// | |
// | arrow_span
// X | &X => "x"
// | - ^^ self.token.span
// | |
// | parsed until here as `"y" & X`
err.span_suggestion_short(
arm_start_span.shrink_to_hi(),
"missing a comma here to end this `match` arm",
",",
Applicability::MachineApplicable,
);
} else if arm_start_lines.lines[0].end_col + rustc_span::CharPos(1)
== expr_lines.lines[0].end_col
{
// similar to the above, but we may typo a `.` or `/` at the end of the line
let comma_span = arm_start_span
.shrink_to_hi()
.with_hi(arm_start_span.hi() + rustc_span::BytePos(1));
if let Ok(res) = sm.span_to_snippet(comma_span)
&& (res == "." || res == "/")
{
err.span_suggestion_short(
comma_span,
"you might have meant to write a `,` to end this `match` arm",
",",
Applicability::MachineApplicable,
);
}
}
}
} else {
err.span_label(
tests/ui/parser/match-arm-comma-typo-issue-140991.fixed
+24
View File
@@ -0,0 +1,24 @@
//@ run-rustfix
pub enum Foo {
X, Y
}
pub fn typo1(foo: Foo) -> Foo {
use Foo::*;
match foo {
X => Y,
Y => X, //~ ERROR expected one of
}
}
pub fn typo2(foo: Foo) -> Foo {
use Foo::*;
match foo {
X => Y,
Y => X, //~ ERROR expected one of
}
}
fn main() { }
tests/ui/parser/match-arm-comma-typo-issue-140991.rs
+24
View File
@@ -0,0 +1,24 @@
//@ run-rustfix
pub enum Foo {
X, Y
}
pub fn typo1(foo: Foo) -> Foo {
use Foo::*;
match foo {
X => Y.
Y => X, //~ ERROR expected one of
}
}
pub fn typo2(foo: Foo) -> Foo {
use Foo::*;
match foo {
X => Y/
Y => X, //~ ERROR expected one of
}
}
fn main() { }
tests/ui/parser/match-arm-comma-typo-issue-140991.stderr
+26
View File
@@ -0,0 +1,26 @@
error: expected one of `(`, `,`, `.`, `::`, `?`, `}`, or an operator, found `=>`
--> $DIR/match-arm-comma-typo-issue-140991.rs:11:11
|
LL | Y => X,
| ^^ expected one of 7 possible tokens
|
help: you might have meant to write a `,` to end this `match` arm
|
LL - X => Y.
LL + X => Y,
|
error: expected one of `!`, `,`, `.`, `::`, `?`, `{`, `}`, or an operator, found `=>`
--> $DIR/match-arm-comma-typo-issue-140991.rs:19:11
|
LL | Y => X,
| ^^ expected one of 8 possible tokens
|
help: you might have meant to write a `,` to end this `match` arm
|
LL - X => Y/
LL + X => Y,
|
error: aborting due to 2 previous errors