Unrolled build for rust-lang#120592

rust-timer · web-flow · commit fa27c7ab03ba · 2024-02-04T15:49:54.000-05:00
Rollup merge of rust-lang#120592 - trevyn:cleanup-to-string, r=Nilstrieb Remove unnecessary `.to_string()`/`.as_str()`s
diff --git a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
@@ -2440,7 +2440,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                                         "consider consuming the `{ty}` when turning it into an \
                                          `Iterator`",
                                     ),
-                                    "into_iter".to_string(),
+                                    "into_iter",
                                     Applicability::MaybeIncorrect,
                                 );
                             }
diff --git a/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs b/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
@@ -924,7 +924,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                         err.span_suggestion_verbose(
                             expr.span.shrink_to_lo(),
                             "use a mutable iterator instead",
-                            "mut ".to_string(),
+                            "mut ",
                             Applicability::MachineApplicable,
                         );
                     }
diff --git a/compiler/rustc_hir_analysis/src/astconv/errors.rs b/compiler/rustc_hir_analysis/src/astconv/errors.rs
@@ -247,7 +247,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                         err.span_suggestion_verbose(
                             assoc_name.span,
                             fluent::hir_analysis_assoc_item_not_found_similar_in_other_trait_with_bound_sugg,
-                            suggested_name.to_string(),
+                            suggested_name,
                             Applicability::MaybeIncorrect,
                         );
                     }
diff --git a/compiler/rustc_hir_typeck/src/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs
@@ -1000,7 +1000,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             err.span_suggestion_verbose(
                 lhs.span.shrink_to_hi(),
                 "you might have meant to write a semicolon here",
-                ";".to_string(),
+                ";",
                 Applicability::MachineApplicable,
             );
             return true;
diff --git a/compiler/rustc_hir_typeck/src/method/suggest.rs b/compiler/rustc_hir_typeck/src/method/suggest.rs
@@ -1116,9 +1116,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                         item_name.span,
                                         format!(
                                             "you might have meant to use `{}`",
-                                            inherent_method.name.as_str()
+                                            inherent_method.name
                                         ),
-                                        inherent_method.name.as_str(),
+                                        inherent_method.name,
                                         Applicability::MaybeIncorrect,
                                     );
                                     break 'outer;
@@ -2019,7 +2019,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 diag.span_suggestion_verbose(
                     sm.span_extend_while(seg1.ident.span.shrink_to_hi(), |c| c == ':').unwrap(),
                     "you may have meant to call an instance method",
-                    ".".to_string(),
+                    ".",
                     Applicability::MaybeIncorrect,
                 );
             }
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
@@ -3288,7 +3288,7 @@ impl<'a> Parser<'a> {
                         } else {
                             Applicability::MaybeIncorrect
                         };
-                        err.span_suggestion_verbose(sugg_sp, msg, "=> ".to_string(), applicability);
+                        err.span_suggestion_verbose(sugg_sp, msg, "=> ", applicability);
                     }
                 }
                 err
diff --git a/compiler/rustc_parse/src/parser/generics.rs b/compiler/rustc_parse/src/parser/generics.rs
@@ -148,7 +148,7 @@ impl<'a> Parser<'a> {
             .with_span_suggestion_verbose(
                 mistyped_const_ident.span,
                 "use the `const` keyword",
-                kw::Const.as_str(),
+                kw::Const,
                 Applicability::MachineApplicable,
             )
             .emit();
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -1453,7 +1453,7 @@ impl<'a> Parser<'a> {
                                 err.span_suggestion_verbose(
                                     prev_span,
                                     "perhaps you meant to use `struct` here",
-                                    "struct".to_string(),
+                                    "struct",
                                     Applicability::MaybeIncorrect,
                                 );
                             }
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -699,7 +699,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                         err.span_suggestion_verbose(
                             span.shrink_to_lo(),
                             msg,
-                            "self.".to_string(),
+                            "self.",
                             Applicability::MachineApplicable,
                         );
                     }
@@ -710,7 +710,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                         err.span_suggestion_verbose(
                             span.shrink_to_lo(),
                             format!("you might have meant to {}", candidate.action()),
-                            "Self::".to_string(),
+                            "Self::",
                             Applicability::MachineApplicable,
                         );
                     }
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
@@ -1288,7 +1288,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
             err.span_suggestion_verbose(
                 obligation.cause.span.shrink_to_hi(),
                 "consider using clone here",
-                ".clone()".to_string(),
+                ".clone()",
                 Applicability::MaybeIncorrect,
             );
             return true;
@@ -3245,7 +3245,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
                             err.span_suggestion_verbose(
                                 span,
                                 "you can use `impl Trait` as the argument type",
-                                "impl ".to_string(),
+                                "impl ",
                                 Applicability::MaybeIncorrect,
                             );
                             let sugg = if !needs_parens {
@@ -5203,7 +5203,7 @@ fn point_at_assoc_type_restriction(
                     err.span_suggestion_verbose(
                         path.span,
                         "replace the associated type with the type specified in this `impl`",
-                        tcx.type_of(new.def_id).skip_binder().to_string(),
+                        tcx.type_of(new.def_id).skip_binder(),
                         Applicability::MachineApplicable,
                     );
                 }

Original file line number	Diff line number	Diff line change
`@@ -2440,7 +2440,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {`
`2440`	`2440`	"consider consuming the `{ty}` when turning it into an \
`2441`	`2441`	`Iterator`",
`2442`	`2442`	`),`
`2443`		`- "into_iter".to_string(),`
	`2443`	`+ "into_iter",`
`2444`	`2444`	`Applicability::MaybeIncorrect,`
`2445`	`2445`	`);`
`2446`	`2446`	`}`
Original file line number	Diff line number	Diff line change
`@@ -924,7 +924,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {`
`924`	`924`	`err.span_suggestion_verbose(`
`925`	`925`	`expr.span.shrink_to_lo(),`
`926`	`926`	`"use a mutable iterator instead",`
`927`		`- "mut ".to_string(),`
	`927`	`+ "mut ",`
`928`	`928`	`Applicability::MachineApplicable,`
`929`	`929`	`);`
`930`	`930`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {`
`247`	`247`	`err.span_suggestion_verbose(`
`248`	`248`	`assoc_name.span,`
`249`	`249`	`fluent::hir_analysis_assoc_item_not_found_similar_in_other_trait_with_bound_sugg,`
`250`		`- suggested_name.to_string(),`
	`250`	`+ suggested_name,`
`251`	`251`	`Applicability::MaybeIncorrect,`
`252`	`252`	`);`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3288,7 +3288,7 @@ impl<'a> Parser<'a> {`
`3288`	`3288`	`} else {`
`3289`	`3289`	`Applicability::MaybeIncorrect`
`3290`	`3290`	`};`
`3291`		`- err.span_suggestion_verbose(sugg_sp, msg, "=> ".to_string(), applicability);`
	`3291`	`+ err.span_suggestion_verbose(sugg_sp, msg, "=> ", applicability);`
`3292`	`3292`	`}`
`3293`	`3293`	`}`
`3294`	`3294`	`err`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ impl<'a> Parser<'a> {`
`148`	`148`	`.with_span_suggestion_verbose(`
`149`	`149`	`mistyped_const_ident.span,`
`150`	`150`	"use the `const` keyword",
`151`		`- kw::Const.as_str(),`
	`151`	`+ kw::Const,`
`152`	`152`	`Applicability::MachineApplicable,`
`153`	`153`	`)`
`154`	`154`	`.emit();`
Original file line number	Diff line number	Diff line change
`@@ -1453,7 +1453,7 @@ impl<'a> Parser<'a> {`
`1453`	`1453`	`err.span_suggestion_verbose(`
`1454`	`1454`	`prev_span,`
`1455`	`1455`	"perhaps you meant to use `struct` here",
`1456`		`- "struct".to_string(),`
	`1456`	`+ "struct",`
`1457`	`1457`	`Applicability::MaybeIncorrect,`
`1458`	`1458`	`);`
`1459`	`1459`	`}`