From 271ebab7a8302d1db72830799051f98ebd3ac187 Mon Sep 17 00:00:00 2001
From: Mathijs van de Nes <git@mathijs.vd-nes.nl>
Date: Thu, 27 Nov 2014 10:55:03 +0100
Subject: [PATCH] Use and create into_inner() instead of unwrap()

---
 src/reader.rs      | 9 ++++++++-
 src/writer_spec.rs | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/reader.rs b/src/reader.rs
index f71d082c..db792541 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -141,8 +141,15 @@ impl<T: Reader+Seek> ZipReader<T>
     /// Unwrap and return the inner reader object
     ///
     /// The position of the reader is undefined.
+    pub fn into_inner(self) -> T
+    {
+        self.inner.into_inner()
+    }
+
+    /// Deprecated method equal to `into_inner()`
+    #[deprecated="renamed to into_inner()"]
     pub fn unwrap(self) -> T
     {
-        self.inner.unwrap()
+        self.into_inner()
     }
 }
diff --git a/src/writer_spec.rs b/src/writer_spec.rs
index f3735fe5..6533af1e 100644
--- a/src/writer_spec.rs
+++ b/src/writer_spec.rs
@@ -66,5 +66,5 @@ fn build_extra_field(_file: &ZipFile) -> ZipResult<Vec<u8>>
 {
     let writer = io::MemWriter::new();
     // Future work
-    Ok(writer.unwrap())
+    Ok(writer.into_inner())
 }