Fix clippy issues

Author: gnzlbg

libtest/formatters/json.rs

@@ -59,16 +59,18 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> {
         stdout: &[u8],
     ) -> io::Result<()> {
         match *result {
-            TrOk => self.write_event("test", desc.name.as_slice(), "ok", None),
+            TestResult::TrOk => {
+                self.write_event("test", desc.name.as_slice(), "ok", None)
+            }
 
-            TrFailed => {
-                let extra_data = if stdout.len() > 0 {
+            TestResult::TrFailed => {
+                let extra_data = if stdout.is_empty() {
+                    None
+                } else {
                     Some(format!(
                         r#""stdout": "{}""#,
                         EscapedString(String::from_utf8_lossy(stdout))
                     ))
-                } else {
-                    None
                 };
 
                 self.write_event(
@@ -79,25 +81,25 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> {
                 )
             }
 
-            TrFailedMsg(ref m) => self.write_event(
+            TestResult::TrFailedMsg(ref m) => self.write_event(
                 "test",
                 desc.name.as_slice(),
                 "failed",
                 Some(format!(r#""message": "{}""#, EscapedString(m))),
             ),
 
-            TrIgnored => {
+            TestResult::TrIgnored => {
                 self.write_event("test", desc.name.as_slice(), "ignored", None)
             }
 
-            TrAllowedFail => self.write_event(
+            TestResult::TrAllowedFail => self.write_event(
                 "test",
                 desc.name.as_slice(),
                 "allowed_failure",
                 None,
             ),
 
-            TrBench(ref bs) => {
+            TestResult::TrBench(ref bs) => {
                 let median = bs.ns_iter_summ.median as usize;
                 let deviation =
                     (bs.ns_iter_summ.max - bs.ns_iter_summ.min) as usize;

libtest/formatters/pretty.rs

@@ -17,7 +17,7 @@ impl<T: Write> PrettyFormatter<T> {
         max_name_len: usize,
         is_multithreaded: bool,
     ) -> Self {
-        PrettyFormatter {
+        Self {
             out,
             use_color,
             max_name_len,
@@ -65,7 +65,7 @@ impl<T: Write> PrettyFormatter<T> {
         color: term::color::Color,
     ) -> io::Result<()> {
         match self.out {
-            Pretty(ref mut term) => {
+            OutputLocation::Pretty(ref mut term) => {
                 if self.use_color {
                     term.fg(color)?;
                 }
@@ -75,7 +75,7 @@ impl<T: Write> PrettyFormatter<T> {
                 }
                 term.flush()
             }
-            Raw(ref mut stdout) => {
+            OutputLocation::Raw(ref mut stdout) => {
                 stdout.write_all(word.as_bytes())?;
                 stdout.flush()
             }
@@ -156,7 +156,7 @@ impl<T: Write> PrettyFormatter<T> {
 
 impl<T: Write> OutputFormatter for PrettyFormatter<T> {
     fn write_run_start(&mut self, test_count: usize) -> io::Result<()> {
-        let noun = if test_count != 1 { "tests" } else { "test" };
+        let noun = if test_count == 1 { "test" } else { "tests" };
         self.write_plain(&format!("\nrunning {} {}\n", test_count, noun))
     }
 
@@ -183,11 +183,13 @@ impl<T: Write> OutputFormatter for PrettyFormatter<T> {
         }
 
         match *result {
-            TrOk => self.write_ok(),
-            TrFailed | TrFailedMsg(_) => self.write_failed(),
-            TrIgnored => self.write_ignored(),
-            TrAllowedFail => self.write_allowed_fail(),
-            TrBench(ref bs) => {
+            TestResult::TrOk => self.write_ok(),
+            TestResult::TrFailed | TestResult::TrFailedMsg(_) => {
+                self.write_failed()
+            }
+            TestResult::TrIgnored => self.write_ignored(),
+            TestResult::TrAllowedFail => self.write_allowed_fail(),
+            TestResult::TrBench(ref bs) => {
                 self.write_bench()?;
                 self.write_plain(&format!(": {}\n", fmt_bench_samples(bs)))
             }

libtest/formatters/terse.rs

@@ -18,7 +18,7 @@ impl<T: Write> TerseFormatter<T> {
         max_name_len: usize,
         is_multithreaded: bool,
     ) -> Self {
-        TerseFormatter {
+        Self {
             out,
             use_color,
             max_name_len,
@@ -77,7 +77,7 @@ impl<T: Write> TerseFormatter<T> {
         color: term::color::Color,
     ) -> io::Result<()> {
         match self.out {
-            Pretty(ref mut term) => {
+            OutputLocation::Pretty(ref mut term) => {
                 if self.use_color {
                     term.fg(color)?;
                 }
@@ -87,7 +87,7 @@ impl<T: Write> TerseFormatter<T> {
                 }
                 term.flush()
             }
-            Raw(ref mut stdout) => {
+            OutputLocation::Raw(ref mut stdout) => {
                 stdout.write_all(word.as_bytes())?;
                 stdout.flush()
             }
@@ -169,7 +169,7 @@ impl<T: Write> TerseFormatter<T> {
 impl<T: Write> OutputFormatter for TerseFormatter<T> {
     fn write_run_start(&mut self, test_count: usize) -> io::Result<()> {
         self.total_test_count = test_count;
-        let noun = if test_count != 1 { "tests" } else { "test" };
+        let noun = if test_count == 1 { "test" } else { "tests" };
         self.write_plain(&format!("\nrunning {} {}\n", test_count, noun))
     }
 
@@ -178,7 +178,9 @@ impl<T: Write> OutputFormatter for TerseFormatter<T> {
         // in order to indicate benchmarks.
         // When running benchmarks, terse-mode should still print their name as if
         // it is the Pretty formatter.
-        if !self.is_multithreaded && desc.name.padding() == PadOnRight {
+        if !self.is_multithreaded
+            && desc.name.padding() == NamePadding::PadOnRight
+        {
             self.write_test_name(desc)?;
         }
 
@@ -192,11 +194,13 @@ impl<T: Write> OutputFormatter for TerseFormatter<T> {
         _: &[u8],
     ) -> io::Result<()> {
         match *result {
-            TrOk => self.write_ok(),
-            TrFailed | TrFailedMsg(_) => self.write_failed(),
-            TrIgnored => self.write_ignored(),
-            TrAllowedFail => self.write_allowed_fail(),
-            TrBench(ref bs) => {
+            TestResult::TrOk => self.write_ok(),
+            TestResult::TrFailed | TestResult::TrFailedMsg(_) => {
+                self.write_failed()
+            }
+            TestResult::TrIgnored => self.write_ignored(),
+            TestResult::TrAllowedFail => self.write_allowed_fail(),
+            TestResult::TrBench(ref bs) => {
                 if self.is_multithreaded {
                     self.write_test_name(desc)?;
                 }