Bladeren bron

fix: clippy warnings

MartinFillon 2 jaren geleden
bovenliggende
commit
154eba6ffb
4 gewijzigde bestanden met toevoegingen van 18 en 17 verwijderingen
  1. 1 0
      src/options/help.rs
  2. 13 13
      src/output/details.rs
  3. 3 3
      src/output/lines.rs
  4. 1 1
      src/output/render/permissions.rs

+ 1 - 0
src/options/help.rs

@@ -28,6 +28,7 @@ DISPLAY OPTIONS
   --hyperlink                display entries as hyperlinks
   --absolute                 display entries with their absolute path (on, follow, off)
   -w, --width COLS           set screen width in columns
+  --json                     output results in JSON format equivalent to long view
 
 
 FILTERING AND SORTING OPTIONS

+ 13 - 13
src/output/details.rs

@@ -222,21 +222,21 @@ impl<'a> Render<'a> {
         Ok(())
     }
 
-    fn print_row<W: Write>(&self, w: &mut W, row: TextCell) -> io::Result<()> {
+    fn print_row<W: Write>(&self, w: &mut W, row: &TextCell) -> io::Result<()> {
         write!(w, "[")?;
         for (i, cell) in row.contents.iter().enumerate() {
             if cell.is_empty() || cell.trim().is_empty() {
                 continue;
             };
-            write!(w, "\"{}\"", cell)?;
+            write!(w, "\"{cell}\"")?;
             if (i + 1) < row.contents.len() {
                 write!(w, ", ")?;
             }
         }
-        write!(w, "{}", "]")
+        write!(w, "]")
     }
 
-    pub fn render_as_json<W: Write>(mut self, w: &mut W) -> io::Result<()> {
+    pub fn render_as_json<W: Write>(self, w: &mut W) -> io::Result<()> {
         let n_cpus = match num_cpus::get() as u32 {
             0 => 1,
             n => n,
@@ -265,22 +265,22 @@ impl<'a> Render<'a> {
                 None,
             );
 
-            write!(w, "{}", "{\n")?;
+            writeln!(w, "{{")?;
             let mut row_iter = self.iterate_with_table(table.unwrap(), rows);
             if self.opts.header {
-                write!(w, "{}", "\"header\":")?;
+                write!(w, "\"header\":")?;
                 let header = row_iter.next().unwrap();
-                self.print_row(w, header)?;
-                write!(w, "{}", ",\n")?;
+                self.print_row(w, &header)?;
+                writeln!(w, ",")?;
             }
-            write!(w, "{}", "\"files\":[")?;
+            write!(w, "\"files\":[")?;
             for (i, row) in row_iter.enumerate() {
-                self.print_row(w, row)?;
+                self.print_row(w, &row)?;
                 if (i + 1) < self.files.len() {
                     write!(w, ", ")?;
                 }
             }
-            write!(w, "{}", "\n]\n}\n")?;
+            writeln!(w, "\n]\n}}")?;
         } else {
             self.add_files_to_table(
                 &mut pool,
@@ -291,14 +291,14 @@ impl<'a> Render<'a> {
                 None,
             );
 
-            write!(w, "{}", "{\"files\":[")?;
+            write!(w, "{{\"files\":[")?;
             for (i, row) in self.iterate(rows).enumerate() {
                 write!(w, "\"{}\"", row.strings())?;
                 if (i + 1) < self.files.len() {
                     write!(w, ", ")?;
                 }
             }
-            write!(w, "{}", "]}}\n")?;
+            writeln!(w, "]}}")?;
         }
         Ok(())
     }

+ 3 - 3
src/output/lines.rs

@@ -37,15 +37,15 @@ impl<'a> Render<'a> {
 
     pub fn render_as_json<W: Write>(mut self, w: &mut W) -> io::Result<()> {
         self.filter.sort_files(&mut self.files);
-        write!(w, "{}", "{\"files\":[")?;
+        write!(w, "{{\"files\":[")?;
         for (i, file) in self.files.iter().enumerate() {
             let name_cell = self.render_file(file);
             write!(w, "\"{}\"", ANSIStrings(&name_cell))?;
             if (i + 1) < self.files.len() {
-                write!(w, "{}", ",")?;
+                write!(w, ",")?;
             }
         }
-        write!(w, "{}", "]}\n")?;
+        writeln!(w, "]}}")?;
 
         Ok(())
     }

+ 1 - 1
src/output/render/permissions.rs

@@ -26,7 +26,7 @@ impl PermissionsPlusRender for Option<f::PermissionsPlus> {
                 // As these are all ASCII characters, we can guarantee that they’re
                 // all going to be one character wide, and don’t need to compute the
                 // cell’s display width.
-                let contents: Vec<_> = chars.iter().map(|c| c.to_string()).collect();
+                let contents: Vec<_> = chars.iter().map(std::string::ToString::to_string).collect();
 
                 TextCell {
                     width: DisplayWidth::from(chars.len()),