Merge #958

958: fix missing formats in diagnostics r=Alexhuszagh a=Emilgardis



Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

src/bin/commands/containers.rs

@@ -416,11 +416,11 @@ pub fn create_persistent_volume(
     // stop the container if it's already running
     let state = docker::remote::container_state(engine, &container, msg_info)?;
     if !state.is_stopped() {
-        msg_info.warn("container {container} was running.")?;
+        msg_info.warn(format_args!("container {container} was running."))?;
         docker::remote::container_stop_default(engine, &container, msg_info)?;
     }
     if state.exists() {
-        msg_info.warn("container {container} was exited.")?;
+        msg_info.warn(format_args!("container {container} was exited."))?;
         docker::remote::container_rm(engine, &container, msg_info)?;
     }
 

src/config.rs

@@ -222,7 +222,7 @@ impl Config {
                     .replace(|c| c == '-' || c == '_', "")
                     .to_lowercase();
                 if mentioned_target != target && mentioned_target_norm == target_norm {
-                    msg_info.warn("a target named \"{mentioned_target}\" is mentioned in the Cross configuration, but the current specified target is \"{target}\".")?;
+                    msg_info.warn(format_args!("a target named \"{mentioned_target}\" is mentioned in the Cross configuration, but the current specified target is \"{target}\"."))?;
                     msg_info.status(" > Is the target misspelled in the Cross configuration?")?;
                 }
             }

src/cross_toml.rs

@@ -183,7 +183,7 @@ impl CrossToml {
         })?;
 
         if !unused.is_empty() {
-            msg_info.warn(format!(
+            msg_info.warn(format_args!(
                 "found unused key(s) in Cross configuration:\n > {}",
                 unused.clone().into_iter().collect::<Vec<_>>().join(", ")
             ))?;

src/lib.rs

@@ -476,7 +476,7 @@ fn warn_on_failure(
     if target.is_builtin() {
         let component = rustup::check_component(&rust_std, toolchain, msg_info)?;
         if component.is_not_available() {
-            msg_info.warn(format!("rust-std is not available for {target}"))?;
+            msg_info.warn(format_args!("rust-std is not available for {target}"))?;
             msg_info.note(
                 format_args!(
                     r#"you may need to build components for the target via `-Z build-std=<components>` or in your cross configuration specify `target.{target}.build-std`
@@ -502,7 +502,7 @@ pub fn run(
 ) -> Result<Option<ExitStatus>> {
     if args.version && args.subcommand.is_none() {
         let commit_info = include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"));
-        msg_info.print(format!(
+        msg_info.print(format_args!(
             concat!("cross ", env!("CARGO_PKG_VERSION"), "{}"),
             commit_info
         ))?;
@@ -756,15 +756,15 @@ pub(crate) fn warn_host_version_mismatch(
             host_version_meta.short_version_string
         );
         if versions.is_lt() || (versions.is_eq() && dates.is_lt()) {
-            msg_info.warn(format!("using older {rustc_warning}.\n > Update with `rustup update --force-non-host {toolchain}`"))?;
+            msg_info.warn(format_args!("using older {rustc_warning}.\n > Update with `rustup update --force-non-host {toolchain}`"))?;
             return Ok(VersionMatch::OlderTarget);
         } else if versions.is_gt() || (versions.is_eq() && dates.is_gt()) {
-            msg_info.warn(format!(
+            msg_info.warn(format_args!(
                 "using newer {rustc_warning}.\n > Update with `rustup update`"
             ))?;
             return Ok(VersionMatch::NewerTarget);
         } else {
-            msg_info.warn(format!("using {rustc_warning}."))?;
+            msg_info.warn(format_args!("using {rustc_warning}."))?;
             return Ok(VersionMatch::Different);
         }
     }