diff --git a/benches/bench_map.rs b/benches/bench_map.rs index e17e80f7..ad6ddd09 100644 --- a/benches/bench_map.rs +++ b/benches/bench_map.rs @@ -28,7 +28,7 @@ pub enum Error { mod decoder { use std::collections::HashMap; - use std::collections::hash_map::MoveEntries; + use std::collections::hash_map::IntoIter; use serialize; use super::Error; @@ -42,7 +42,7 @@ mod decoder { pub struct IntDecoder { len: uint, - iter: MoveEntries<String, int>, + iter: IntoIter<String, int>, stack: Vec<Value>, } @@ -216,7 +216,7 @@ mod decoder { mod deserializer { use std::collections::HashMap; - use std::collections::hash_map::MoveEntries; + use std::collections::hash_map::IntoIter; use super::Error; use super::Error::{EndOfStream, SyntaxError}; @@ -235,7 +235,7 @@ mod deserializer { pub struct IntDeserializer { stack: Vec<State>, len: uint, - iter: MoveEntries<String, int>, + iter: IntoIter<String, int>, } impl IntDeserializer { diff --git a/benches/bench_vec.rs b/benches/bench_vec.rs index 6af27b25..a06f651c 100644 --- a/benches/bench_vec.rs +++ b/benches/bench_vec.rs @@ -34,7 +34,7 @@ mod decoder { pub struct IntDecoder { len: uint, - iter: vec::MoveItems<int>, + iter: vec::IntoIter<int>, } impl IntDecoder { @@ -186,7 +186,7 @@ mod decoder { pub struct U8Decoder { len: uint, - iter: vec::MoveItems<u8>, + iter: vec::IntoIter<u8>, } impl U8Decoder { @@ -359,7 +359,7 @@ mod deserializer { pub struct IntDeserializer { state: State, len: uint, - iter: vec::MoveItems<int>, + iter: vec::IntoIter<int>, } impl IntDeserializer { @@ -431,7 +431,7 @@ mod deserializer { pub struct U8Deserializer { state: State, len: uint, - iter: vec::MoveItems<u8>, + iter: vec::IntoIter<u8>, } impl U8Deserializer { diff --git a/src/json/value.rs b/src/json/value.rs index 7e4967e3..70ac4733 100644 --- a/src/json/value.rs +++ b/src/json/value.rs @@ -302,8 +302,8 @@ impl<D: de::Deserializer<E>, E> de::Deserialize<D, E> for Value { enum State { Value(Value), - Array(vec::MoveItems<Value>), - Object(btree_map::MoveEntries<String, Value>), + Array(vec::IntoIter<Value>), + Object(btree_map::IntoIter<String, Value>), End, }