From 9b60b8faaa440ad44518ca341fa4b42019b5a3cd Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 21 Mar 2015 14:13:30 +0100
Subject: [PATCH 1/2] Update for
 <https://github.com/rust-lang/rust/pull/23292>.

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 75b3701..a933b23 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -73,7 +73,7 @@ pub fn load_png<P: AsPath + ?Sized>(path: &P) -> Result<Image, String> {
     };
     let mut buffer = vec![];
     match reader.read_to_end(&mut buffer) {
-        Ok(()) => (),
+        Ok(_) => (),
         Err(e) => return Err(format!("could not read file: {}", e.description())),
     }
     load_png_from_memory(&buffer)
@@ -307,7 +307,7 @@ mod test {
         };
         let mut buf = vec![];
         match reader.read_to_end(&mut buf) {
-            Ok(()) => (),
+            Ok(_) => (),
             Err(e) => panic!(e)
         }
         b.bench_n(1, |b| b.iter(|| {

From 4e48880c8d485776f29fb5f739dda0131f951482 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 21 Mar 2015 14:09:49 +0100
Subject: [PATCH 2/2] Update for
 <https://github.com/rust-lang/rust/pull/23316>.

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index a933b23..b491191 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,7 +66,7 @@ pub extern fn read_data(png_ptr: *mut ffi::png_struct, data: *mut u8, length: si
     }
 }
 
-pub fn load_png<P: AsPath + ?Sized>(path: &P) -> Result<Image, String> {
+pub fn load_png<P: AsPath>(path: P) -> Result<Image, String> {
     let mut reader = match File::open(path) {
         Ok(r) => r,
         Err(e) => return Err(format!("could not open file: {}", e.description())),
@@ -191,7 +191,7 @@ pub extern fn flush_data(png_ptr: *mut ffi::png_struct) {
     }
 }
 
-pub fn store_png<P: AsPath + ?Sized>(img: &mut Image, path: &P) -> Result<(),String> {
+pub fn store_png<P: AsPath>(img: &mut Image, path: P) -> Result<(),String> {
     let mut file = match File::create(path) {
         Ok(f) => f,
         Err(e) => return Err(format!("{}", e))