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

matthiaskrgr · web-flow · commit 748925bf1bbb · 2022-08-15T10:28:13.000+02:00
Make code slightly more uniform
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -590,7 +590,7 @@ impl<'a> Parser<'a> {
             )
         } else if expected.is_empty() {
             (
-                format!("unexpected token: {}", actual),
+                format!("unexpected token: {actual}"),
                 (self.prev_token.span, "unexpected token after this".to_string()),
             )
         } else {
@@ -1497,7 +1497,7 @@ impl<'a> Parser<'a> {
         MultiSugg {
             msg: format!("use `{}= 1` instead", kind.op.chr()),
             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)),
             ],
             applicability: Applicability::HasPlaceholders,

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ impl<'a> Parser<'a> {`
`590`	`590`	`)`
`591`	`591`	`} else if expected.is_empty() {`
`592`	`592`	`(`
`593`		`- format!("unexpected token: {}", actual),`
	`593`	`+ format!("unexpected token: {actual}"),`
`594`	`594`	`(self.prev_token.span, "unexpected token after this".to_string()),`
`595`	`595`	`)`
`596`	`596`	`} else {`
`@@ -1497,7 +1497,7 @@ impl<'a> Parser<'a> {`
`1497`	`1497`	`MultiSugg {`
`1498`	`1498`	msg: format!("use `{}= 1` instead", kind.op.chr()),
`1499`	`1499`	`patches: vec![`
`1500`		`- (pre_span, format!("{{ let {} = ", tmp_var)),`
	`1500`	`+ (pre_span, format!("{{ let {tmp_var} = ")),`
`1501`	`1501`	`(post_span, format!("; {} {}= 1; {} }}", base_src, kind.op.chr(), tmp_var)),`
`1502`	`1502`	`],`
`1503`	`1503`	`applicability: Applicability::HasPlaceholders,`