Merge pull request ogham#587 from brown121407/master

ogham · web-flow · commit 3d82fc7683c5 · 2020-01-19T00:50:32.000Z
Fix "trait objects without an explicit `dyn` are deprecated"
diff --git a/src/output/file_name.rs b/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,
 }
 
 
diff --git a/src/output/render/git.rs b/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"),

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ pub struct FileStyle {`
`16`	`16`	`pub classify: Classify,`
`17`	`17`
`18`	`18`	`/// Mapping of file extensions to colours, to highlight regular files.`
`19`		`- pub exts: Box<FileColours>,`
	`19`	`+ pub exts: Box<dyn FileColours>,`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`impl FileStyle {`
`@@ -92,7 +92,7 @@ pub struct FileName<'a, 'dir: 'a, C: Colours+'a> {`
`92`	`92`	`classify: Classify,`
`93`	`93`
`94`	`94`	`/// Mapping of file extensions to colours, to highlight regular files.`
`95`		`- exts: &'a FileColours,`
	`95`	`+ exts: &'a dyn FileColours,`
`96`	`96`	`}`
`97`	`97`
`98`	`98`