Merge pull request #587 from brown121407/master

Fix "trait objects without an explicit `dyn` are deprecated"

src/output/file_name.rs

@@ -16,7 +16,7 @@ pub struct FileStyle {
     pub classify: Classify,
 
     /// Mapping of file extensions to colours, to highlight regular files.
-    pub exts: Box<FileColours>,
+    pub exts: Box<dyn FileColours>,
 }
 
 impl FileStyle {
@@ -92,7 +92,7 @@ pub struct FileName<'a,  'dir: 'a,  C: Colours+'a> {
     classify: Classify,
 
     /// Mapping of file extensions to colours, to highlight regular files.
-    exts: &'a FileColours,
+    exts: &'a dyn FileColours,
 }
 
 

src/output/render/git.rs

@@ -5,7 +5,7 @@ use crate::fs::fields as f;
 
 
 impl f::Git {
-    pub fn render(&self, colours: &Colours) -> TextCell {
+    pub fn render(&self, colours: &dyn Colours) -> TextCell {
         TextCell {
             width: DisplayWidth::from(2),
             contents: vec![
@@ -18,7 +18,7 @@ impl f::Git {
 
 
 impl f::GitStatus {
-    fn render(&self, colours: &Colours) -> ANSIString<'static> {
+    fn render(&self, colours: &dyn Colours) -> ANSIString<'static> {
         match *self {
             f::GitStatus::NotModified  => colours.not_modified().paint("-"),
             f::GitStatus::New          => colours.new().paint("N"),