Replace MoveItems and MoveEntries with IntoIter

Following a rust std change.
This commit is contained in:
Thomas Bahn 2014-12-23 16:43:17 +01:00
parent 681a609844
commit cca63836d2
3 changed files with 10 additions and 10 deletions

View File

@ -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 {

View File

@ -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 {

View File

@ -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,
}