move to osstring

Author: Shourya742

src/bootstrap/src/utils/exec.rs

@@ -5,7 +5,7 @@
 #![allow(warnings)]
 
 use std::collections::HashMap;
-use std::ffi::OsStr;
+use std::ffi::{OsStr, OsString};
 use std::fmt::{Debug, Formatter};
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::path::Path;
@@ -69,9 +69,9 @@ impl OutputMode {
 /// [allow_failure]: BootstrapCommand::allow_failure
 /// [delay_failure]: BootstrapCommand::delay_failure
 pub struct BootstrapCommand {
-    program: String,
-    args: Vec<String>,
-    envs: Vec<(String, String)>,
+    program: OsString,
+    args: Vec<OsString>,
+    envs: Vec<(OsString, OsString)>,
     cwd: Option<PathBuf>,
 
     command: Command,
@@ -90,8 +90,7 @@ impl<'a> BootstrapCommand {
     }
 
     pub fn arg<S: AsRef<OsStr>>(&mut self, arg: S) -> &mut Self {
-        let arg_str = arg.as_ref().to_string_lossy().into_owned();
-        self.args.push(arg_str.clone());
+        self.args.push(arg.as_ref().to_os_string());
         self.command.arg(arg.as_ref());
         self
     }
@@ -112,9 +111,7 @@ impl<'a> BootstrapCommand {
         K: AsRef<OsStr>,
         V: AsRef<OsStr>,
     {
-        let key_str = key.as_ref().to_string_lossy().into_owned();
-        let val_str = val.as_ref().to_string_lossy().into_owned();
-        self.envs.push((key_str.clone(), val_str.clone()));
+        self.envs.push((key.as_ref().to_os_string(), val.as_ref().to_os_string()));
         self.command.env(key, val);
         self
     }
@@ -249,7 +246,7 @@ impl From<Command> for BootstrapCommand {
         let program = command.get_program().to_owned();
 
         Self {
-            program: program.clone().into_string().unwrap(),
+            program: program.clone(),
             args: Vec::new(),
             envs: Vec::new(),
             cwd: None,

src/bootstrap/src/utils/execution_context.rs

@@ -158,11 +158,9 @@ impl ExecutionContext {
 
         let output = self.start(command, stdout, stderr).wait_for_output(self);
 
-        self.command_cache.insert(cache_key, output.clone());
-
-        // if output != CommandOutput::default() {
-        //     self.command_cache.insert(cache_key, output.clone());
-        // }
+        if !self.dry_run() || command.run_always {
+            self.command_cache.insert(cache_key, output.clone());
+        }
 
         output
     }