avail cache key for all commands

Author: Shourya742

src/bootstrap/src/utils/exec.rs

@@ -300,20 +300,17 @@ impl<'a> BootstrapCommand {
         }
     }
 
-    pub fn cache_key(&self) -> Option<CommandCacheKey> {
-        if !self.should_cache {
-            return None;
-        }
+    pub fn cache_key(&self) -> CommandCacheKey {
         let command = &self.command;
-        Some(CommandCacheKey {
+        CommandCacheKey {
             program: command.get_program().into(),
             args: command.get_args().map(OsStr::to_os_string).collect(),
             envs: command
                 .get_envs()
                 .map(|(k, v)| (k.to_os_string(), v.map(|val| val.to_os_string())))
                 .collect(),
             cwd: command.get_current_dir().map(Path::to_path_buf),
-        })
+        }
     }
 }
 
@@ -503,7 +500,7 @@ enum CommandState<'a> {
         stdout: OutputMode,
         stderr: OutputMode,
         executed_at: &'a Location<'a>,
-        cache_key: Option<CommandCacheKey>,
+        cache_key: CommandCacheKey,
         start_time: Instant,
     },
 }
@@ -603,11 +600,10 @@ impl ExecutionContext {
     ) -> DeferredCommand<'a> {
         let cache_key = command.cache_key();
 
-        if let Some(cached_output) = cache_key.as_ref().and_then(|key| self.command_cache.get(key))
-        {
+        if let Some(cached_output) = self.command_cache.get(&cache_key) {
             command.mark_as_executed();
             self.verbose(|| println!("Cache hit: {command:?}"));
-            self.profiler.record(cache_key.unwrap(), Duration::from_secs(0));
+            self.profiler.record(cache_key, Duration::from_secs(0));
             return DeferredCommand { state: CommandState::Cached(cached_output) };
         }
 
@@ -751,7 +747,8 @@ impl<'a> DeferredCommand<'a> {
                     Self::finish_process(process, command, stdout, stderr, executed_at, exec_ctx);
 
                 if (!exec_ctx.dry_run() || command.run_in_dry_run)
-                    && let (Some(cache_key), Some(_)) = (&cache_key, output.status())
+                    && output.status().is_some()
+                    && command.should_cache
                 {
                     exec_ctx.command_cache.insert(cache_key.clone(), output.clone());
                     let duration = start_time.elapsed();