Merge pull request #136 from linkmauve/fix-warning

Fix deprecated Error::description() warning

Author: HeroicKatora

Cargo.toml

@@ -15,7 +15,7 @@ byteorder = "1.0"
 rayon = { version = "1.0", optional = true }
 
 [dev-dependencies]
-png = "0.14"
+png = "0.15"
 walkdir = "2.0"
 criterion = "0.3"
 

examples/decode.rs

@@ -24,14 +24,14 @@ fn main() {
 
     let output_file = File::create(output_path).unwrap();
     let mut encoder = png::Encoder::new(output_file, info.width as u32, info.height as u32);
-    encoder.set(png::BitDepth::Eight);
+    encoder.set_depth(png::BitDepth::Eight);
 
     match info.pixel_format {
-        jpeg::PixelFormat::L8     => encoder.set(png::ColorType::Grayscale),
-        jpeg::PixelFormat::RGB24  => encoder.set(png::ColorType::RGB),
+        jpeg::PixelFormat::L8     => encoder.set_color(png::ColorType::Grayscale),
+        jpeg::PixelFormat::RGB24  => encoder.set_color(png::ColorType::RGB),
         jpeg::PixelFormat::CMYK32 => {
             data = cmyk_to_rgb(&mut data);
-            encoder.set(png::ColorType::RGB)
+            encoder.set_color(png::ColorType::RGB)
         },
     };
 

src/error.rs

@@ -54,16 +54,7 @@ impl fmt::Display for Error {
 }
 
 impl StdError for Error {
-    fn description(&self) -> &str {
-        match *self {
-            Error::Format(_)         => "invalid JPEG format",
-            Error::Unsupported(_)    => "unsupported JPEG feature",
-            Error::Io(ref err)       => err.description(),
-            Error::Internal(ref err) => err.description(),
-        }
-    }
-
-    fn cause(&self) -> Option<&dyn StdError> {
+    fn source(&self) -> Option<&(dyn StdError + 'static)> {
         match *self {
             Error::Io(ref err) => Some(err),
             Error::Internal(ref err) => Some(&**err),

tests/reftest/mod.rs

@@ -1,5 +1,5 @@
 use jpeg;
-use png::{self, HasParameters};
+use png;
 use std::cmp;
 use std::fs::File;
 use std::path::Path;
@@ -94,8 +94,8 @@ fn reftest_decoder<T: std::io::Read>(mut decoder: jpeg::Decoder<T>, path: &Path,
         let output_path = path.with_file_name(format!("{}-diff.png", path.file_stem().unwrap().to_str().unwrap()));
         let output = File::create(&output_path).unwrap();
         let mut encoder = png::Encoder::new(output, info.width as u32, info.height as u32);
-        encoder.set(png::BitDepth::Eight);
-        encoder.set(ref_pixel_format);
+        encoder.set_depth(png::BitDepth::Eight);
+        encoder.set_color(ref_pixel_format);
         encoder.write_header().expect("png failed to write header").write_image_data(&pixels).expect("png failed to write data");
 
         panic!("decoding difference: {:?}, maximum difference was {}", output_path, max_diff);