From 63bd929eb5bf08ca9c9b57fd1d886839536332a4 Mon Sep 17 00:00:00 2001
From: Ben S <ogham@bsago.me>
Date: Tue, 3 Nov 2015 11:17:44 +0000
Subject: Upgrade to latest ansi_term

Changes to the way ANSIStrings work mean we need to dereference the strings before putting them in an ANSIString. There's more that can be done here, but this gets it to compile for now.
---
 src/output/grid.rs |  4 ++--
 src/output/mod.rs  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/output')

diff --git a/src/output/grid.rs b/src/output/grid.rs
index 0fd0af4..13d2f8d 100644
--- a/src/output/grid.rs
+++ b/src/output/grid.rs
@@ -26,7 +26,7 @@ impl Grid {
 
         for file in files.iter() {
             grid.add(grid::Cell {
-                contents:  file_colour(&self.colours, file).paint(&file.name).to_string(),
+                contents:  file_colour(&self.colours, file).paint(&*file.name).to_string(),
                 width:     file.file_name_width(),
             });
         }
@@ -37,7 +37,7 @@ impl Grid {
         else {
             // File names too long for a grid - drop down to just listing them!
             for file in files.iter() {
-                println!("{}", file_colour(&self.colours, file).paint(&file.name));
+                println!("{}", file_colour(&self.colours, file).paint(&*file.name));
             }
         }
     }
diff --git a/src/output/mod.rs b/src/output/mod.rs
index 4205852..5a3fb31 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -20,21 +20,21 @@ pub fn filename(file: &File, colours: &Colours, links: bool) -> String {
     }
     else {
         let style = file_colour(colours, file);
-        style.paint(&file.name).to_string()
+        style.paint(&*file.name).to_string()
     }
 }
 
 fn symlink_filename(file: &File, colours: &Colours) -> String {
     match file.link_target() {
         Ok(target) => format!("{} {} {}",
-                              file_colour(colours, file).paint(&file.name),
+                              file_colour(colours, file).paint(&*file.name),
                               colours.punctuation.paint("->"),
-                              ANSIStrings(&[ colours.symlink_path.paint(&target.path_prefix()),
-                                             file_colour(colours, &target).paint(&target.name) ])),
+                              ANSIStrings(&[ colours.symlink_path.paint(target.path_prefix()),
+                                             file_colour(colours, &target).paint(target.name) ])),
 
         Err(filename) => format!("{} {} {}",
-                                 file_colour(colours, file).paint(&file.name),
+                                 file_colour(colours, file).paint(&*file.name),
                                  colours.broken_arrow.paint("->"),
-                                 colours.broken_filename.paint(&filename)),
+                                 colours.broken_filename.paint(filename)),
     }
 }
-- 
cgit v1.2.3