bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #133060 - tyrone-wu:removelet-span-suggestion, r=jieyouxu

Browse source 
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
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-11-17 23:56:09 +08:00 • committed by GitHub
commit 0b157e88d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_parse/src/errors.rs
View file

@ -650,8 +650,9 @@ pub(crate) struct LeftArrowOperator {
#[diag(parse_remove_let)]
pub(crate) struct RemoveLet {
#[primary_span]
#[suggestion(applicability = "machine-applicable", code = "", style = "verbose")]
pub span: Span,
#[suggestion(applicability = "machine-applicable", code = "", style = "verbose")]
pub suggestion: Span,
}
#[derive(Diagnostic)]

2
compiler/rustc_parse/src/parser/pat.rs
View file

@ -685,7 +685,7 @@ impl<'a> Parser<'a> {
self.bump();
// Trim extra space after the `let`
let span = lo.with_hi(self.token.span.lo());
self.dcx().emit_err(RemoveLet { span });
self.dcx().emit_err(RemoveLet { span: lo, suggestion: span });
lo = self.token.span;
}