Fix botched fix for rust-lang/rust#111633

trailofbits · May 31, 2023 · e91518e · e91518e
1 parent 23a8541
commit e91518e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/driver/src/lib.rs b/driver/src/lib.rs
@@ -119,14 +119,14 @@ impl Callbacks {
                 let lib = result.unwrap_or_else(|err| {
                     // smoelius: rust-lang/rust#111633 changed the type of `early_error`'s `msg`
                     // argument from `&str` to `impl Into<DiagnosticMessage>`.
+                    let msg = format!(
+                        "could not load library `{}`: {}",
+                        path.to_string_lossy(),
+                        err
+                    );
                     rustc_session::early_error(
                         rustc_session::config::ErrorOutputType::default(),
-                        format!(
-                            "could not load library `{}`: {}",
-                            path.to_string_lossy(),
-                            err
-                        )
-                        .as_str(),
+                        msg.as_str(),
                     );
                 });
 

diff --git a/utils/linting/src/lib.rs b/utils/linting/src/lib.rs
@@ -455,9 +455,10 @@ pub fn config_toml(name: &str) -> ConfigResult<Option<toml::Value>> {
 /// etc. includes a call to `init_config`.
 pub fn init_config(sess: &rustc_session::Session) {
     try_init_config(sess).unwrap_or_else(|err| {
+        let msg = format!("could not read configuration file: {err}");
         rustc_session::early_error(
             rustc_session::config::ErrorOutputType::default(),
-            format!("could not read configuration file: {err}").as_str(),
+            msg.as_str(),
         );
     });
 }