Deserializer: now can provide the underlying R.

Author: 3Hren

src/decode.rs

@@ -2213,6 +2213,21 @@ impl<R: Read> Deserializer<R> {
         }
     }
 
+    /// Gets a reference to the underlying reader in this decoder.
+    pub fn get_ref(&self) -> &R {
+        &self.rd
+    }
+
+    /// Gets a mutable reference to the underlying reader in this decoder.
+    pub fn get_mut(&mut self) -> &mut R {
+        &mut self.rd
+    }
+
+    /// Consumes this decoder returning the underlying reader.
+    pub fn into_inner(self) -> R {
+        self.rd
+    }
+
     fn read_str<V>(&mut self, len: u32, mut visitor: V) -> Result<V::Value>
         where V: serde::de::Visitor
     {
@@ -2255,8 +2270,6 @@ impl<R: Read> Deserializer<R> {
 
         visitor.visit_bytes(&mut self.buf[..])
     }
-
-    // TODO: Add an ability to borrow underlying reader and to destruct this decoder.
 }
 
 /// Unstable: docs; examples; incomplete

tests/func/mod.rs

@@ -1,3 +1,4 @@
 mod encode;
 mod decode;
 mod rserialize;
+mod serde;

tests/func/serde.rs

@@ -0,0 +1,42 @@
+use std::io::Cursor;
+
+use serde::Deserialize;
+
+use msgpack::Deserializer;
+
+#[test]
+fn pass_deserializer_get_ref() {
+    let buf = [0xc0];
+    let cur = Cursor::new(&buf[..]);
+
+    let mut de = Deserializer::new(cur);
+
+    assert_eq!((), Deserialize::deserialize(&mut de).ok().unwrap());
+    assert_eq!(1, de.get_ref().position());
+}
+
+#[test]
+fn pass_deserializer_get_mut() {
+    let buf = [0xc0];
+    let cur = Cursor::new(&buf[..]);
+
+    let mut de = Deserializer::new(cur);
+
+    assert_eq!((), Deserialize::deserialize(&mut de).ok().unwrap());
+    de.get_mut().set_position(0);
+
+    assert_eq!((), Deserialize::deserialize(&mut de).ok().unwrap());
+}
+
+#[test]
+fn pass_deserializer_into_inner() {
+    let buf = [0xc0];
+    let cur = Cursor::new(&buf[..]);
+
+    let mut de = Deserializer::new(cur);
+
+    assert_eq!((), Deserialize::deserialize(&mut de).ok().unwrap());
+    let cur = de.into_inner();
+
+    assert_eq!(1, cur.position());
+}