From 28266ee4418e8d4b34e0080a75463215b5387f68 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Fri, 2 Aug 2019 09:14:57 +0200
Subject: [PATCH] use explicit dyn with Write to appease compiler

---
 src/controller.rs |  4 ++--
 src/output.rs     |  2 +-
 src/printer.rs    | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/controller.rs b/src/controller.rs
index ac39abbe..161a1758 100644
--- a/src/controller.rs
+++ b/src/controller.rs
@@ -76,7 +76,7 @@ impl<'b> Controller<'b> {
         &self,
         reader: InputFileReader,
         printer: &mut P,
-        writer: &mut Write,
+        writer: &mut dyn Write,
         input_file: InputFile<'a>,
     ) -> Result<()> {
         printer.print_header(writer, input_file)?;
@@ -91,7 +91,7 @@ impl<'b> Controller<'b> {
     fn print_file_ranges<P: Printer>(
         &self,
         printer: &mut P,
-        writer: &mut Write,
+        writer: &mut dyn Write,
         mut reader: InputFileReader,
         line_ranges: &LineRanges,
     ) -> Result<()> {
diff --git a/src/output.rs b/src/output.rs
index 14ed5bce..e0b567a6 100644
--- a/src/output.rs
+++ b/src/output.rs
@@ -98,7 +98,7 @@ impl OutputType {
         OutputType::Stdout(io::stdout())
     }
 
-    pub fn handle(&mut self) -> Result<&mut Write> {
+    pub fn handle(&mut self) -> Result<&mut dyn Write> {
         Ok(match *self {
             OutputType::Pager(ref mut command) => command
                 .stdin
diff --git a/src/printer.rs b/src/printer.rs
index 2d993a88..e95ebcf0 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -30,12 +30,12 @@ use crate::style::OutputWrap;
 use crate::terminal::{as_terminal_escaped, to_ansi_color};
 
 pub trait Printer {
-    fn print_header(&mut self, handle: &mut Write, file: InputFile) -> Result<()>;
-    fn print_footer(&mut self, handle: &mut Write) -> Result<()>;
+    fn print_header(&mut self, handle: &mut dyn Write, file: InputFile) -> Result<()>;
+    fn print_footer(&mut self, handle: &mut dyn Write) -> Result<()>;
     fn print_line(
         &mut self,
         out_of_range: bool,
-        handle: &mut Write,
+        handle: &mut dyn Write,
         line_number: usize,
         line_buffer: &[u8],
     ) -> Result<()>;
@@ -50,18 +50,18 @@ impl SimplePrinter {
 }
 
 impl Printer for SimplePrinter {
-    fn print_header(&mut self, _handle: &mut Write, _file: InputFile) -> Result<()> {
+    fn print_header(&mut self, _handle: &mut dyn Write, _file: InputFile) -> Result<()> {
         Ok(())
     }
 
-    fn print_footer(&mut self, _handle: &mut Write) -> Result<()> {
+    fn print_footer(&mut self, _handle: &mut dyn Write) -> Result<()> {
         Ok(())
     }
 
     fn print_line(
         &mut self,
         out_of_range: bool,
-        handle: &mut Write,
+        handle: &mut dyn Write,
         _line_number: usize,
         line_buffer: &[u8],
     ) -> Result<()> {
@@ -166,7 +166,7 @@ impl<'a> InteractivePrinter<'a> {
         }
     }
 
-    fn print_horizontal_line(&mut self, handle: &mut Write, grid_char: char) -> Result<()> {
+    fn print_horizontal_line(&mut self, handle: &mut dyn Write, grid_char: char) -> Result<()> {
         if self.panel_width == 0 {
             writeln!(
                 handle,
@@ -192,7 +192,7 @@ impl<'a> InteractivePrinter<'a> {
 }
 
 impl<'a> Printer for InteractivePrinter<'a> {
-    fn print_header(&mut self, handle: &mut Write, file: InputFile) -> Result<()> {
+    fn print_header(&mut self, handle: &mut dyn Write, file: InputFile) -> Result<()> {
         if !self.config.output_components.header() {
             if Some(ContentType::BINARY) == self.content_type {
                 let input = match file {
@@ -262,7 +262,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
         Ok(())
     }
 
-    fn print_footer(&mut self, handle: &mut Write) -> Result<()> {
+    fn print_footer(&mut self, handle: &mut dyn Write) -> Result<()> {
         if self.config.output_components.grid() && self.content_type.map_or(false, |c| c.is_text())
         {
             self.print_horizontal_line(handle, '┴')
@@ -274,7 +274,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
     fn print_line(
         &mut self,
         out_of_range: bool,
-        handle: &mut Write,
+        handle: &mut dyn Write,
         line_number: usize,
         line_buffer: &[u8],
     ) -> Result<()> {