Skip to content

Commit bba1236

Browse files
committed
Trim whitespace in RemoveLet primary span
Separate `RemoveLet` span into primary span for `let` and removal suggestion span for `let `, so that primary span does not include whitespace. Fixes: #133031 Signed-off-by: Tyrone Wu <[email protected]>
1 parent c82e0df commit bba1236

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Diff for: compiler/rustc_parse/src/errors.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,9 @@ pub(crate) struct LeftArrowOperator {
650650
#[diag(parse_remove_let)]
651651
pub(crate) struct RemoveLet {
652652
#[primary_span]
653-
#[suggestion(applicability = "machine-applicable", code = "", style = "verbose")]
654653
pub span: Span,
654+
#[suggestion(applicability = "machine-applicable", code = "", style = "verbose")]
655+
pub suggestion: Span,
655656
}
656657

657658
#[derive(Diagnostic)]

Diff for: compiler/rustc_parse/src/parser/pat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ impl<'a> Parser<'a> {
685685
self.bump();
686686
// Trim extra space after the `let`
687687
let span = lo.with_hi(self.token.span.lo());
688-
self.dcx().emit_err(RemoveLet { span });
688+
self.dcx().emit_err(RemoveLet { span: lo, suggestion: span });
689689
lo = self.token.span;
690690
}
691691

Diff for: tests/ui/parser/unnecessary-let.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: expected pattern, found `let`
22
--> $DIR/unnecessary-let.rs:2:9
33
|
44
LL | for let x of [1, 2, 3] {}
5-
| ^^^^
5+
| ^^^
66
|
77
help: remove the unnecessary `let` keyword
88
|
@@ -25,7 +25,7 @@ error: expected pattern, found `let`
2525
--> $DIR/unnecessary-let.rs:7:9
2626
|
2727
LL | let 1 => {}
28-
| ^^^^
28+
| ^^^
2929
|
3030
help: remove the unnecessary `let` keyword
3131
|

0 commit comments

Comments
 (0)