Simplify io:Error creation

A lot of errors were created using io::Error::from(io::ErrorKind::*), which can be replaced with the more concise io::ErrorKind::*.into().
AronParker · Apr 23, 2022 · cae7fd5 · cae7fd5
1 parent 0a39d06
commit cae7fd5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/decode.rs b/src/decode.rs
@@ -517,7 +517,7 @@ impl<R: BufRead> DecompressorReader<R> {
         } else {
             Err(IntoInnerError::new(
                 self,
-                io::Error::from(io::ErrorKind::UnexpectedEof),
+                io::ErrorKind::UnexpectedEof.into(),
             ))
         }
     }
@@ -547,7 +547,7 @@ impl<R: BufRead> Read for DecompressorReader<R> {
                 _ if bytes_written > 0 => return Ok(bytes_written),
                 DecoderInfo::Finished => return Ok(0),
                 DecoderInfo::NeedsMoreInput if eof => {
-                    return Err(io::Error::from(io::ErrorKind::UnexpectedEof));
+                    return Err(io::ErrorKind::UnexpectedEof.into());
                 }
                 DecoderInfo::NeedsMoreInput => continue,
                 DecoderInfo::NeedsMoreOutput if buf.is_empty() => return Ok(0),
@@ -654,7 +654,7 @@ impl<W: Write> DecompressorWriter<W> {
         } else {
             Err(IntoInnerError::new(
                 self,
-                io::Error::from(io::ErrorKind::UnexpectedEof),
+                io::ErrorKind::UnexpectedEof.into(),
             ))
         }
     }

diff --git a/src/encode.rs b/src/encode.rs
@@ -598,7 +598,7 @@ impl<R: BufRead> CompressorReader<R> {
         } else {
             Err(IntoInnerError::new(
                 self,
-                io::Error::from(io::ErrorKind::UnexpectedEof),
+                io::ErrorKind::UnexpectedEof.into(),
             ))
         }
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -127,7 +127,6 @@ pub use decode::DecompressorReader;
 pub use decode::DecompressorWriter;
 
 use brotlic_sys::*;
-use std::io::ErrorKind;
 use std::os::raw::c_int;
 use std::{fmt, io};
 use std::error::Error;
@@ -745,7 +744,7 @@ impl Error for CompressError {}
 
 impl From<CompressError> for io::Error {
     fn from(err: CompressError) -> Self {
-        io::Error::new(ErrorKind::Other, err)
+        io::Error::new(io::ErrorKind::Other, err)
     }
 }
 
@@ -763,7 +762,7 @@ impl Error for DecompressError {}
 
 impl From<DecompressError> for io::Error {
     fn from(err: DecompressError) -> Self {
-        io::Error::new(ErrorKind::Other, err)
+        io::Error::new(io::ErrorKind::Other, err)
     }
 }