Rollup merge of #100534 - Rageking8:Rageking8-refactor1, r=compiler-errors

Make code slightly more uniform
This commit is contained in:
Matthias Krüger 2022-08-15 10:28:13 +02:00 committed by GitHub
commit 748925bf1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -590,7 +590,7 @@ impl<'a> Parser<'a> {
) )
} else if expected.is_empty() { } else if expected.is_empty() {
( (
format!("unexpected token: {}", actual), format!("unexpected token: {actual}"),
(self.prev_token.span, "unexpected token after this".to_string()), (self.prev_token.span, "unexpected token after this".to_string()),
) )
} else { } else {
@ -1497,7 +1497,7 @@ impl<'a> Parser<'a> {
MultiSugg { MultiSugg {
msg: format!("use `{}= 1` instead", kind.op.chr()), msg: format!("use `{}= 1` instead", kind.op.chr()),
patches: vec![ patches: vec![
(pre_span, format!("{{ let {} = ", tmp_var)), (pre_span, format!("{{ let {tmp_var} = ")),
(post_span, format!("; {} {}= 1; {} }}", base_src, kind.op.chr(), tmp_var)), (post_span, format!("; {} {}= 1; {} }}", base_src, kind.op.chr(), tmp_var)),
], ],
applicability: Applicability::HasPlaceholders, applicability: Applicability::HasPlaceholders,