Merge pull request image-rs#107 from kaksmet/deprecations

Fix some deprecation warnings

Author: kaksmet

src/decoder.rs

@@ -126,7 +126,7 @@ impl<R: Read> Decoder<R> {
             // The metadata has already been read.
             return Ok(Vec::new());
         }
-        else if self.frame.is_none() && (self.reader.read_u8()? != 0xFF || Marker::from_u8(try!(self.reader.read_u8())) != Some(Marker::SOI)) {
+        else if self.frame.is_none() && (self.reader.read_u8()? != 0xFF || Marker::from_u8(self.reader.read_u8()?) != Some(Marker::SOI)) {
             return Err(Error::Format("first two bytes is not a SOI marker".to_owned()));
         }
 

src/error.rs

@@ -41,7 +41,7 @@ pub enum Error {
     /// An I/O error occurred while decoding the image.
     Io(IoError),
     /// An internal error occurred while decoding the image.
-    Internal(Box<StdError>),
+    Internal(Box<dyn StdError>),
 }
 
 impl fmt::Display for Error {
@@ -65,7 +65,7 @@ impl StdError for Error {
         }
     }
 
-    fn cause(&self) -> Option<&StdError> {
+    fn cause(&self) -> Option<&dyn StdError> {
         match *self {
             Error::Io(ref err) => Some(err),
             Error::Internal(ref err) => Some(&**err),

src/marker.rs

@@ -67,7 +67,7 @@ impl Marker {
         match n {
             0x00 => None, // Byte stuffing
             0x01 => Some(TEM),
-            0x02 ... 0xBF => Some(RES),
+            0x02 ..= 0xBF => Some(RES),
             0xC0 => Some(SOF(0)),
             0xC1 => Some(SOF(1)),
             0xC2 => Some(SOF(2)),

src/parser.rs

@@ -113,8 +113,8 @@ pub fn parse_sof<R: Read>(reader: &mut R, marker: Marker) -> Result<FrameInfo> {
 
     let is_baseline = marker == SOF(0);
     let is_differential = match marker {
-        SOF(0 ... 3) | SOF(9 ... 11)  => false,
-        SOF(5 ... 7) | SOF(13 ... 15) => true,
+        SOF(0 ..= 3) | SOF(9 ..= 11)  => false,
+        SOF(5 ..= 7) | SOF(13 ..= 15) => true,
         _ => panic!(),
     };
     let coding_process = match marker {
@@ -124,8 +124,8 @@ pub fn parse_sof<R: Read>(reader: &mut R, marker: Marker) -> Result<FrameInfo> {
         _ => panic!(),
     };
     let entropy_coding = match marker {
-        SOF(0 ... 3) | SOF(5 ... 7)     => EntropyCoding::Huffman,
-        SOF(9 ... 11) | SOF(13 ... 15)  => EntropyCoding::Arithmetic,
+        SOF(0 ..= 3) | SOF(5 ..= 7)     => EntropyCoding::Huffman,
+        SOF(9 ..= 11) | SOF(13 ..= 15)  => EntropyCoding::Arithmetic,
         _ => panic!(),
     };
 
@@ -296,8 +296,8 @@ pub fn parse_sos<R: Read>(reader: &mut R, frame: &FrameInfo) -> Result<ScanInfo>
         return Err(Error::Format("scan with more than one component and more than 10 blocks per MCU".to_owned()));
     }
 
-    let spectral_selection_start = try!(reader.read_u8());
-    let spectral_selection_end = try!(reader.read_u8());
+    let spectral_selection_start = reader.read_u8()?;
+    let spectral_selection_end = reader.read_u8()?;
 
     let byte = reader.read_u8()?;
     let successive_approximation_high = byte >> 4;

src/upsampler.rs

@@ -7,7 +7,7 @@ pub struct Upsampler {
 }
 
 struct UpsamplerComponent {
-    upsampler: Box<Upsample + Sync>,
+    upsampler: Box<dyn Upsample + Sync>,
     width: usize,
     height: usize,
     row_stride: usize,
@@ -75,7 +75,7 @@ struct UpsamplerGeneric {
 fn choose_upsampler(sampling_factors: (u8, u8),
                     max_sampling_factors: (u8, u8),
                     output_width: u16,
-                    output_height: u16) -> Result<Box<Upsample + Sync>> {
+                    output_height: u16) -> Result<Box<dyn Upsample + Sync>> {
     let h1 = sampling_factors.0 == max_sampling_factors.0 || output_width == 1;
     let v1 = sampling_factors.1 == max_sampling_factors.1 || output_height == 1;
     let h2 = sampling_factors.0 * 2 == max_sampling_factors.0;