From f18c28161db10b05bf9a9a22f9390700eab3676d Mon Sep 17 00:00:00 2001
From: Thomas Bahn <thomas@thomas-bahn.net>
Date: Fri, 6 Feb 2015 22:01:19 +0100
Subject: [PATCH] Follow rust std: `Peekable` changed signature

---
 serde2/src/de.rs      | 2 +-
 serde2/src/json/de.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/serde2/src/de.rs b/serde2/src/de.rs
index 0a07a11a..91af3885 100644
--- a/serde2/src/de.rs
+++ b/serde2/src/de.rs
@@ -704,7 +704,7 @@ mod tests {
     }
 
     struct TokenDeserializer<'a> {
-        tokens: iter::Peekable<Token<'a>, vec::IntoIter<Token<'a>>>,
+        tokens: iter::Peekable<vec::IntoIter<Token<'a>>>,
     }
 
     impl<'a> TokenDeserializer<'a> {
diff --git a/serde2/src/json/de.rs b/serde2/src/json/de.rs
index 73d797bd..85e23a4d 100644
--- a/serde2/src/json/de.rs
+++ b/serde2/src/json/de.rs
@@ -528,12 +528,11 @@ pub fn from_str<'a, T>(s: &'a str) -> Result<T, Error>
 
 #[cfg(test)]
 mod tests {
-    use std::str;
     use std::fmt::Debug;
     use std::collections::BTreeMap;
 
     use de::Deserialize;
-    use super::{Parser, from_str};
+    use super::from_str;
     use super::super::error::{Error, ErrorCode};
 
     macro_rules! treemap {