Fix reporting of less and GIT_CONFIG_* env vars

dandavison · Jul 29, 2023 · 67352ff · 67352ff
1 parent f52d74c
commit 67352ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/subcommands/doctor/git_config_env.rs b/src/subcommands/doctor/git_config_env.rs
@@ -48,12 +48,12 @@ impl Diagnostic for GitConfigEnvVars {
     }
 
     fn diagnose(&self) -> Health {
-        let diagnosis_is_healthy = self.report();
+        let (description, is_healthy) = self.report();
         let remedy = "Unset `GIT_CONFIG_*` environment variables.".to_string();
 
-        match diagnosis_is_healthy.1 {
-            true => Unhealthy(diagnosis_is_healthy.0, remedy),
-            false => Healthy,
+        match is_healthy {
+            false => Unhealthy(description, remedy),
+            true => Healthy,
         }
     }
 

diff --git a/src/subcommands/doctor/less.rs b/src/subcommands/doctor/less.rs
@@ -36,8 +36,8 @@ impl Diagnostic for Less {
             ),
             Some(n) if n >= self.min_version => (
                 format!(
-                    "`less` version >= {} is required (your version: {})",
-                    MIN_LESS_VERSION, n
+                    "Your less version ({}) is >= {} as required",
+                    n, self.min_version
                 ),
                 true,
             ),
@@ -46,12 +46,12 @@ impl Diagnostic for Less {
     }
 
     fn diagnose(&self) -> Health {
-        let diagnosis_is_healthy = self.report();
+        let (description, is_healthy) = self.report();
         let remedy = format!("Install `less` version >= {}", MIN_LESS_VERSION);
 
-        match diagnosis_is_healthy.1 {
-            true => Unhealthy(diagnosis_is_healthy.0, remedy),
-            false => Healthy,
+        match is_healthy {
+            false => Unhealthy(description, remedy),
+            true => Healthy,
         }
     }