Răsfoiți Sursa

Move TreePart to its own module

Benjamin Sago 10 ani în urmă
părinte
comite
d1ea4c0ff5
3 a modificat fișierele cu 28 adăugiri și 28 ștergeri
  1. 1 28
      src/output/details.rs
  2. 1 0
      src/output/mod.rs
  3. 26 0
      src/output/tree.rs

+ 1 - 28
src/output/details.rs

@@ -137,6 +137,7 @@ use options::{FileFilter, RecurseOptions};
 use output::colours::Colours;
 use output::column::{Alignment, Column, Columns, SizeFormat};
 use output::cell::{TextCell, DisplayWidth};
+use output::tree::TreePart;
 use super::filename;
 
 
@@ -744,34 +745,6 @@ impl<U> Table<U> where U: Users {
 }
 
 
-#[derive(PartialEq, Debug, Clone)]
-enum TreePart {
-
-    /// Rightmost column, *not* the last in the directory.
-    Edge,
-
-    /// Not the rightmost column, and the directory has not finished yet.
-    Line,
-
-    /// Rightmost column, and the last in the directory.
-    Corner,
-
-    /// Not the rightmost column, and the directory *has* finished.
-    Blank,
-}
-
-impl TreePart {
-    fn ascii_art(&self) -> &'static str {
-        match *self {
-            TreePart::Edge    => "├──",
-            TreePart::Line    => "│  ",
-            TreePart::Corner  => "└──",
-            TreePart::Blank   => "   ",
-        }
-    }
-}
-
-
 lazy_static! {
     static ref DATE_AND_TIME: DateFormat<'static> =
         DateFormat::parse("{2>:D} {:M} {2>:h}:{02>:m}").unwrap();

+ 1 - 0
src/output/mod.rs

@@ -16,6 +16,7 @@ mod grid_details;
 pub mod column;
 mod cell;
 mod colours;
+mod tree;
 
 pub fn filename(file: File, colours: &Colours, links: bool) -> TextCellContents {
     if links && file.is_link() {

+ 26 - 0
src/output/tree.rs

@@ -0,0 +1,26 @@
+#[derive(PartialEq, Debug, Clone)]
+pub enum TreePart {
+
+    /// Rightmost column, *not* the last in the directory.
+    Edge,
+
+    /// Not the rightmost column, and the directory has not finished yet.
+    Line,
+
+    /// Rightmost column, and the last in the directory.
+    Corner,
+
+    /// Not the rightmost column, and the directory *has* finished.
+    Blank,
+}
+
+impl TreePart {
+    pub fn ascii_art(&self) -> &'static str {
+        match *self {
+            TreePart::Edge    => "├──",
+            TreePart::Line    => "│  ",
+            TreePart::Corner  => "└──",
+            TreePart::Blank   => "   ",
+        }
+    }
+}