--wip-- [skip ci]

Author: GuillaumeLagrange

src/cli/setup.rs

@@ -68,26 +68,30 @@ pub fn status() -> Result<()> {
         if executor.support_level(&system_info.os) == ExecutorSupport::Unsupported {
             continue;
         }
-        let tool_status = executor.tool_status();
-        match &tool_status.status {
-            ToolInstallStatus::Installed { version } => {
-                info!("  {} {} ({})", check_mark(), tool_status.tool_name, version);
-            }
-            ToolInstallStatus::IncorrectVersion { version, message } => {
-                info!(
-                    "  {} {} ({}, {})",
-                    warn_mark(),
-                    tool_status.tool_name,
-                    version,
-                    message
-                );
-            }
-            ToolInstallStatus::NotInstalled => {
-                info!(
-                    "  {} {} (not installed)",
-                    cross_mark(),
-                    tool_status.tool_name
-                );
+        match executor.tool_status() {
+            Some(tool_status) => match &tool_status.status {
+                ToolInstallStatus::Installed { version } => {
+                    info!("  {} {} ({})", check_mark(), tool_status.tool_name, version);
+                }
+                ToolInstallStatus::IncorrectVersion { version, message } => {
+                    info!(
+                        "  {} {} ({}, {})",
+                        warn_mark(),
+                        tool_status.tool_name,
+                        version,
+                        message
+                    );
+                }
+                ToolInstallStatus::NotInstalled => {
+                    info!(
+                        "  {} {} (not installed)",
+                        cross_mark(),
+                        tool_status.tool_name
+                    );
+                }
+            },
+            None => {
+                info!("  {} No tool to install", check_mark());
             }
         }
     }

src/executor/memory/executor.rs

@@ -73,8 +73,8 @@ impl Executor for MemoryExecutor {
         ExecutorName::Memory
     }
 
-    fn tool_status(&self) -> ToolStatus {
-        get_memtrack_status()
+    fn tool_status(&self) -> Option<ToolStatus> {
+        Some(get_memtrack_status())
     }
 
     fn support_level(&self, os: &Os) -> ExecutorSupport {

src/executor/valgrind/executor.rs

@@ -19,8 +19,8 @@ impl Executor for ValgrindExecutor {
         ExecutorName::Valgrind
     }
 
-    fn tool_status(&self) -> ToolStatus {
-        get_valgrind_status()
+    fn tool_status(&self) -> Option<ToolStatus> {
+        Some(get_valgrind_status())
     }
 
     fn support_level(&self, os: &Os) -> ExecutorSupport {

src/executor/wall_time/executor.rs

@@ -122,7 +122,9 @@ impl Executor for WallTimeExecutor {
     }
 
     fn tool_status(&self) -> Option<ToolStatus> {
-        self.perf.map(|_| super::perf::setup::get_perf_status())
+        self.perf
+            .as_ref()
+            .map(|_| super::perf::setup::get_perf_status())
     }
 
     fn support_level(&self, os: &Os) -> ExecutorSupport {