Merge branch 'master' of github.com:ogham/exa

src/exa.rs

@@ -10,7 +10,7 @@ use dir::Dir;
 use options::Options;
 use unix::Unix;
 
-use ansi_term::{Plain, strip_formatting};
+use ansi_term::{Paint, Plain, strip_formatting};
 
 pub mod column;
 pub mod dir;

src/file.rs

@@ -2,7 +2,7 @@ use std::io::{fs, IoResult};
 use std::io;
 use std::str::from_utf8_lossy;
 
-use ansi_term::{Colour, Plain, Style, Red, Green, Yellow, Blue, Purple, Cyan, Fixed};
+use ansi_term::{Paint, Colour, Plain, Style, Red, Green, Yellow, Blue, Purple, Cyan, Fixed};
 
 use column::{Column, Permissions, FileName, FileSize, User, Group, HardLinks, Inode, Blocks};
 use format::{format_metric_bytes, format_IEC_bytes};

src/filetype.rs

@@ -1,7 +1,7 @@
 use file::File;
 use std::io;
 
-use ansi_term::{Colour, Plain, Style, Red, Green, Yellow, Blue, Cyan, Fixed};
+use ansi_term::{Paint, Colour, Plain, Style, Red, Green, Yellow, Blue, Cyan, Fixed};
 
 static Grey: Colour = Fixed(244);