Explorar o código

Rename some stuff

Benjamin Sago %!s(int64=8) %!d(string=hai) anos
pai
achega
80d5c2ad6d
Modificáronse 3 ficheiros con 11 adicións e 7 borrados
  1. 5 5
      src/output/details.rs
  2. 1 1
      src/output/grid_details.rs
  3. 5 1
      src/output/tree.rs

+ 5 - 5
src/output/details.rs

@@ -153,14 +153,14 @@ impl<'a> Render<'a> {
             // This is weird, but I can't find a way around it:
             // https://internals.rust-lang.org/t/should-option-mut-t-implement-copy/3715/6
             let mut table = Some(table);
-            self.add_files_to_table(&mut table, &mut rows, &self.files, TreeDepth(0));
+            self.add_files_to_table(&mut table, &mut rows, &self.files, TreeDepth::root());
 
             for row in self.iterate_with_table(table.unwrap(), rows) {
                 writeln!(w, "{}", row.strings())?
             }
         }
         else {
-            self.add_files_to_table(&mut None, &mut rows, &self.files, TreeDepth(0));
+            self.add_files_to_table(&mut None, &mut rows, &self.files, TreeDepth::root());
 
             for row in self.iterate(rows) {
                 writeln!(w, "{}", row.strings())?
@@ -278,7 +278,7 @@ impl<'a> Render<'a> {
 
     pub fn render_header(&self, header: TableRow) -> Row {
         Row {
-            tree:     TreeParams::new(TreeDepth(0), false),
+            tree:     TreeParams::new(TreeDepth::root(), false),
             cells:    Some(header),
             name:     TextCell::paint_str(self.colours.header, "Name"),
         }
@@ -351,7 +351,7 @@ impl<'a> Iterator for TableIter<'a> {
 
             // If any tree characters have been printed, then add an extra
             // space, which makes the output look much better.
-            if !row.tree.is_zero() {
+            if !row.tree.is_at_root() {
                 cell.add_spaces(1);
             }
 
@@ -400,7 +400,7 @@ impl<'a> Iterator for Iter<'a> {
 
             // If any tree characters have been printed, then add an extra
             // space, which makes the output look much better.
-            if !row.tree.is_zero() {
+            if !row.tree.is_at_root() {
                 cell.add_spaces(1);
             }
 

+ 1 - 1
src/output/grid_details.rs

@@ -120,7 +120,7 @@ impl<'a> Render<'a> {
 
             let (ref mut table, ref mut rows) = tables[index];
             table.add_widths(&row);
-            let details_row = drender.render_file(row, file_name.clone(), TreeParams::new(TreeDepth(0), false));
+            let details_row = drender.render_file(row, file_name.clone(), TreeParams::new(TreeDepth::root(), false));
             rows.push(details_row);
         }
 

+ 5 - 1
src/output/tree.rs

@@ -142,12 +142,16 @@ impl TreeParams {
         TreeParams { depth, last }
     }
 
-    pub fn is_zero(&self) -> bool {
+    pub fn is_at_root(&self) -> bool {
         self.depth.0 == 0
     }
 }
 
 impl TreeDepth {
+    pub fn root() -> TreeDepth {
+        TreeDepth(0)
+    }
+
     pub fn deeper(self) -> TreeDepth {
         TreeDepth(self.0 + 1)
     }