Simplify printf and shell format suggestions

Author: thaliaarchi

compiler/rustc_builtin_macros/src/format.rs

@@ -711,11 +711,9 @@ fn report_missing_placeholders(
                     };
 
                     let pos = sub.position();
-                    let sub = String::from(sub.as_str());
-                    if explained.contains(&sub) {
+                    if !explained.insert(sub.as_string()) {
                         continue;
                     }
-                    explained.insert(sub);
 
                     if !found_foreign {
                         found_foreign = true;

compiler/rustc_builtin_macros/src/format_foreign.rs

@@ -13,10 +13,10 @@ pub(crate) mod printf {
     }
 
     impl<'a> Substitution<'a> {
-        pub(crate) fn as_str(&self) -> &str {
+        pub(crate) fn as_string(&self) -> String {
             match self {
-                Substitution::Format(fmt) => fmt.span,
-                Substitution::Escape(_) => "%%",
+                Substitution::Format(fmt) => fmt.span.into(),
+                Substitution::Escape(_) => "%%".into(),
             }
         }
 
@@ -628,7 +628,7 @@ pub(crate) mod shell {
     }
 
     impl Substitution<'_> {
-        pub(crate) fn as_str(&self) -> String {
+        pub(crate) fn as_string(&self) -> String {
             match self {
                 Substitution::Ordinal(n, _) => format!("${n}"),
                 Substitution::Name(n, _) => format!("${n}"),