Follow rust std: Peekable changed signature

This commit is contained in:
Thomas Bahn
2015-02-06 22:01:19 +01:00
parent 70e8556e07
commit f18c28161d
2 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -704,7 +704,7 @@ mod tests {
} }
struct TokenDeserializer<'a> { struct TokenDeserializer<'a> {
tokens: iter::Peekable<Token<'a>, vec::IntoIter<Token<'a>>>, tokens: iter::Peekable<vec::IntoIter<Token<'a>>>,
} }
impl<'a> TokenDeserializer<'a> { impl<'a> TokenDeserializer<'a> {
+1 -2
View File
@@ -528,12 +528,11 @@ pub fn from_str<'a, T>(s: &'a str) -> Result<T, Error>
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::str;
use std::fmt::Debug; use std::fmt::Debug;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use de::Deserialize; use de::Deserialize;
use super::{Parser, from_str}; use super::from_str;
use super::super::error::{Error, ErrorCode}; use super::super::error::{Error, ErrorCode};
macro_rules! treemap { macro_rules! treemap {