Trim extra space when suggesting removing bad let

clubby789 · clubby789 · commit 1136bbf0668d · 2024-11-13T13:19:13.000Z
diff --git a/compiler/rustc_parse/src/parser/pat.rs b/compiler/rustc_parse/src/parser/pat.rs
@@ -683,7 +683,9 @@ impl<'a> Parser<'a> {
             })
         {
             self.bump();
-            self.dcx().emit_err(RemoveLet { span: lo });
+            // Trim extra space after the `let`
+            let span = lo.with_hi(self.token.span.lo());
+            self.dcx().emit_err(RemoveLet { span });
             lo = self.token.span;
         }
 
diff --git a/tests/ui/parser/unnecessary-let.stderr b/tests/ui/parser/unnecessary-let.stderr
@@ -2,12 +2,12 @@ error: expected pattern, found `let`
   --> $DIR/unnecessary-let.rs:2:9
    |
 LL |     for let x of [1, 2, 3] {}
-   |         ^^^
+   |         ^^^^
    |
 help: remove the unnecessary `let` keyword
    |
 LL -     for let x of [1, 2, 3] {}
-LL +     for  x of [1, 2, 3] {}
+LL +     for x of [1, 2, 3] {}
    |
 
 error: missing `in` in `for` loop
@@ -25,12 +25,12 @@ error: expected pattern, found `let`
   --> $DIR/unnecessary-let.rs:7:9
    |
 LL |         let 1 => {}
-   |         ^^^
+   |         ^^^^
    |
 help: remove the unnecessary `let` keyword
    |
 LL -         let 1 => {}
-LL +          1 => {}
+LL +         1 => {}
    |
 
 error: aborting due to 3 previous errors

Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,9 @@ impl<'a> Parser<'a> {`
`683`	`683`	`})`
`684`	`684`	`{`
`685`	`685`	`self.bump();`
`686`		`- self.dcx().emit_err(RemoveLet { span: lo });`
	`686`	+ // Trim extra space after the `let`
	`687`	`+ let span = lo.with_hi(self.token.span.lo());`
	`688`	`+ self.dcx().emit_err(RemoveLet { span });`
`687`	`689`	`lo = self.token.span;`
`688`	`690`	`}`
`689`	`691`
Original file line number	Diff line number	Diff line change
@@ -2,12 +2,12 @@ error: expected pattern, found `let`
`2`	`2`	`--> $DIR/unnecessary-let.rs:2:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| for let x of [1, 2, 3] {}`
`5`		`- \| ^^^`
	`5`	`+ \| ^^^^`
`6`	`6`	`\|`
`7`	`7`	help: remove the unnecessary `let` keyword
`8`	`8`	`\|`
`9`	`9`	`LL - for let x of [1, 2, 3] {}`
`10`		`-LL + for x of [1, 2, 3] {}`
	`10`	`+LL + for x of [1, 2, 3] {}`
`11`	`11`	`\|`
`12`	`12`
`13`	`13`	error: missing `in` in `for` loop
@@ -25,12 +25,12 @@ error: expected pattern, found `let`
`25`	`25`	`--> $DIR/unnecessary-let.rs:7:9`
`26`	`26`	`\|`
`27`	`27`	`LL \| let 1 => {}`
`28`		`- \| ^^^`
	`28`	`+ \| ^^^^`
`29`	`29`	`\|`
`30`	`30`	help: remove the unnecessary `let` keyword
`31`	`31`	`\|`
`32`	`32`	`LL - let 1 => {}`
`33`		`-LL + 1 => {}`
	`33`	`+LL + 1 => {}`
`34`	`34`	`\|`
`35`	`35`
`36`	`36`	`error: aborting due to 3 previous errors`