Turn File into simply a data source

And move all the rendering, ansi_term, colourful stuff into the output modules, which is the only place they should be used!

1 files changed, 5 insertions, 4 deletions

diff --git a/src/dir.rs b/src/dir.rs
index 9433829..438bef7 100644
--- a/src/dir.rs
+++ b/src/dir.rs
@@ -1,6 +1,7 @@
 use colours::Colours;
 use feature::Git;
 use file::File;
+use file;
 
 use std::io;
 use std::fs;
@@ -65,11 +66,11 @@ impl Dir {
     }
 
     /// Get a string describing the Git status of the given file.
-    pub fn git_status(&self, path: &Path, colours: &Colours, prefix_lookup: bool) -> String {
+    pub fn git_status(&self, path: &Path, prefix_lookup: bool) -> file::Git {
         match (&self.git, prefix_lookup) {
-            (&Some(ref git), false)  => git.status(colours, path),
-            (&Some(ref git), true)   => git.dir_status(colours, path),
-            (&None, _)               => colours.punctuation.paint("--").to_string(),
+            (&Some(ref git), false)  => git.status(path),
+            (&Some(ref git), true)   => git.dir_status(path),
+            (&None, _)               => file::Git::empty()
         }
     }
 }