Improvements from code review

dandavison · Nov 23, 2022 · 157b8e8 · 157b8e8
1 parent 369a044
commit 157b8e8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/src/subcommands/doctor/less.rs b/src/subcommands/doctor/less.rs
@@ -27,23 +27,21 @@ impl Less {
 impl Diagnostic for Less {
     fn report(&self) -> (String, bool) {
         match self.version {
-            Some(n) => match n < self.min_version {
-                true => (
-                    format!(
-                        "`less` version >= {} is required (your version: {})",
-                        MIN_LESS_VERSION, n
-                    ),
-                    false,
+            Some(n) if n < self.min_version => (
+                format!(
+                    "`less` version >= {} is required (your version: {})",
+                    MIN_LESS_VERSION, n
                 ),
-                false => (
-                    format!(
-                        "`less` version >= {} is required (your version: {})",
-                        MIN_LESS_VERSION, n
-                    ),
-                    true,
+                false,
+            ),
+            Some(n) if n >= self.min_version => (
+                format!(
+                    "`less` version >= {} is required (your version: {})",
+                    MIN_LESS_VERSION, n
                 ),
-            },
-            None => ("`less` version >= {} is required".to_string(), false),
+                true,
+            ),
+            _ => ("`less` version >= {} is required".to_string(), false),
         }
     }
 

diff --git a/src/subcommands/doctor/report.rs b/src/subcommands/doctor/report.rs
@@ -12,38 +12,40 @@ pub fn run_diagnostics() -> std::io::Result<()> {
         Box::new(PagerEnvVars::probe()),
     ];
 
-    let mut reports = Vec::new();
-    for d in diagnostics {
-        reports.push(build_report_row(d));
-    }
+    let reports = diagnostics
+        .into_iter()
+        .map(|d| Report::from_diagnostic(d))
+        .collect();
 
     print_table(reports);
     Ok(())
 }
 
-fn build_report_row(diagnostic: Box<dyn Diagnostic>) -> Report {
-    let remedy = diagnostic.remedy();
-    match remedy {
-        Some(r) => Report {
-            result: "❌".to_string(),
-            description: diagnostic.report().0,
-            remedy: r,
-        },
-        None => Report {
-            result: "✅".to_string(),
-            description: diagnostic.report().0,
-            remedy: "".to_string(),
-        },
-    }
-}
-
 #[derive(Tabled)]
 struct Report {
     result: String,
     description: String,
     remedy: String,
 }
 
+impl Report {
+    pub fn from_diagnostic(diagnostic: Box<dyn Diagnostic>) -> Self {
+        let remedy = diagnostic.remedy();
+        match remedy {
+            Some(r) => Report {
+                result: "❌".to_string(),
+                description: diagnostic.report().0,
+                remedy: r,
+            },
+            None => Report {
+                result: "✅".to_string(),
+                description: diagnostic.report().0,
+                remedy: "".to_string(),
+            },
+        }
+    }
+}
+
 fn print_table(report: Vec<Report>) {
     let mut table = Table::new(&report);
     table.with(Style::modern());