diff options
-rw-r--r-- | buffered-reader/src/adapter.rs | 2 | ||||
-rw-r--r-- | buffered-reader/src/decompress_bzip2.rs | 2 | ||||
-rw-r--r-- | buffered-reader/src/decompress_deflate.rs | 2 | ||||
-rw-r--r-- | buffered-reader/src/dup.rs | 5 | ||||
-rw-r--r-- | buffered-reader/src/eof.rs | 3 | ||||
-rw-r--r-- | buffered-reader/src/limitor.rs | 4 | ||||
-rw-r--r-- | buffered-reader/src/reserve.rs | 4 |
7 files changed, 14 insertions, 8 deletions
diff --git a/buffered-reader/src/adapter.rs b/buffered-reader/src/adapter.rs index cb19c3df..59a85dd2 100644 --- a/buffered-reader/src/adapter.rs +++ b/buffered-reader/src/adapter.rs @@ -17,7 +17,7 @@ pub struct Adapter<T: BufferedReader<B>, B: fmt::Debug, C: fmt::Debug> { impl<T: BufferedReader<B>, B: fmt::Debug, C: fmt::Debug> fmt::Display for Adapter<T, B, C> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "Adapter") + f.debug_struct("Adapter").finish() } } diff --git a/buffered-reader/src/decompress_bzip2.rs b/buffered-reader/src/decompress_bzip2.rs index 12bd7246..eca9800c 100644 --- a/buffered-reader/src/decompress_bzip2.rs +++ b/buffered-reader/src/decompress_bzip2.rs @@ -50,7 +50,7 @@ impl<R: BufferedReader<C>, C: fmt::Debug> fmt::Debug for Bzip<R, C> { impl<R: BufferedReader<C>, C: fmt::Debug> fmt::Display for Bzip<R, C> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "Bzip") + f.debug_struct("Bzip").finish() } } diff --git a/buffered-reader/src/decompress_deflate.rs b/buffered-reader/src/decompress_deflate.rs index 647172fb..89ebeabe 100644 --- a/buffered-reader/src/decompress_deflate.rs +++ b/buffered-reader/src/decompress_deflate.rs @@ -42,7 +42,7 @@ impl<R: BufferedReader<C>, C: fmt::Debug> io::Read for Deflate<R, C> { impl<R: BufferedReader<C>, C: fmt::Debug> fmt::Display for Deflate<R, C> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "Deflate") + f.debug_struct("Deflate").finish() } } diff --git a/buffered-reader/src/dup.rs b/buffered-reader/src/dup.rs index 8a8e5067..6cb6c70f 100644 --- a/buffered-reader/src/dup.rs +++ b/buffered-reader/src/dup.rs @@ -22,8 +22,9 @@ pub struct Dup<T: BufferedReader<C>, C: fmt::Debug> { impl<T: BufferedReader<C>, C: fmt::Debug> fmt::Display for Dup<T, C> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "Dup ({} bytes consumed)", - self.cursor) + f.debug_struct("Dup") + .field("cursor", &self.cursor) + .finish() } } diff --git a/buffered-reader/src/eof.rs b/buffered-reader/src/eof.rs index 3371ef63..b2db3ec7 100644 --- a/buffered-reader/src/eof.rs +++ b/buffered-reader/src/eof.rs @@ -11,7 +11,8 @@ pub struct EOF<C> { impl<C> fmt::Display for EOF<C> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "EOF") + f.debug_struct("EOF") + .finish() } } diff --git a/buffered-reader/src/limitor.rs b/buffered-reader/src/limitor.rs index 82bde9f9..619c8d3e 100644 --- a/buffered-reader/src/limitor.rs +++ b/buffered-reader/src/limitor.rs @@ -14,7 +14,9 @@ pub struct Limitor<T: BufferedReader<C>, C: fmt::Debug> { impl<T: BufferedReader<C>, C: fmt::Debug> fmt::Display for Limitor<T, C> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "Limitor ({} bytes)", self.limit) + f.debug_struct("Limitor") + .field("limit", &self.limit) + .finish() } } diff --git a/buffered-reader/src/reserve.rs b/buffered-reader/src/reserve.rs index db428ea9..37f3ea0d 100644 --- a/buffered-reader/src/reserve.rs +++ b/buffered-reader/src/reserve.rs @@ -18,7 +18,9 @@ pub struct Reserve<T: BufferedReader<C>, C: fmt::Debug> { impl<T: BufferedReader<C>, C: fmt::Debug> fmt::Display for Reserve<T, C> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "Reserve ({} bytes)", self.reserve) + f.debug_struct("Reserve") + .field("reserve", &self.reserve) + .finish() } } |