mirror of
https://github.com/pezkuwichain/serde.git
synced 2026-06-13 04:21:04 +00:00
Replace MoveItems and MoveEntries with IntoIter
Following a rust std change.
This commit is contained in:
@@ -28,7 +28,7 @@ pub enum Error {
|
|||||||
|
|
||||||
mod decoder {
|
mod decoder {
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::collections::hash_map::MoveEntries;
|
use std::collections::hash_map::IntoIter;
|
||||||
use serialize;
|
use serialize;
|
||||||
|
|
||||||
use super::Error;
|
use super::Error;
|
||||||
@@ -42,7 +42,7 @@ mod decoder {
|
|||||||
|
|
||||||
pub struct IntDecoder {
|
pub struct IntDecoder {
|
||||||
len: uint,
|
len: uint,
|
||||||
iter: MoveEntries<String, int>,
|
iter: IntoIter<String, int>,
|
||||||
stack: Vec<Value>,
|
stack: Vec<Value>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,7 +216,7 @@ mod decoder {
|
|||||||
|
|
||||||
mod deserializer {
|
mod deserializer {
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::collections::hash_map::MoveEntries;
|
use std::collections::hash_map::IntoIter;
|
||||||
|
|
||||||
use super::Error;
|
use super::Error;
|
||||||
use super::Error::{EndOfStream, SyntaxError};
|
use super::Error::{EndOfStream, SyntaxError};
|
||||||
@@ -235,7 +235,7 @@ mod deserializer {
|
|||||||
pub struct IntDeserializer {
|
pub struct IntDeserializer {
|
||||||
stack: Vec<State>,
|
stack: Vec<State>,
|
||||||
len: uint,
|
len: uint,
|
||||||
iter: MoveEntries<String, int>,
|
iter: IntoIter<String, int>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IntDeserializer {
|
impl IntDeserializer {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ mod decoder {
|
|||||||
|
|
||||||
pub struct IntDecoder {
|
pub struct IntDecoder {
|
||||||
len: uint,
|
len: uint,
|
||||||
iter: vec::MoveItems<int>,
|
iter: vec::IntoIter<int>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IntDecoder {
|
impl IntDecoder {
|
||||||
@@ -186,7 +186,7 @@ mod decoder {
|
|||||||
|
|
||||||
pub struct U8Decoder {
|
pub struct U8Decoder {
|
||||||
len: uint,
|
len: uint,
|
||||||
iter: vec::MoveItems<u8>,
|
iter: vec::IntoIter<u8>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl U8Decoder {
|
impl U8Decoder {
|
||||||
@@ -359,7 +359,7 @@ mod deserializer {
|
|||||||
pub struct IntDeserializer {
|
pub struct IntDeserializer {
|
||||||
state: State,
|
state: State,
|
||||||
len: uint,
|
len: uint,
|
||||||
iter: vec::MoveItems<int>,
|
iter: vec::IntoIter<int>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IntDeserializer {
|
impl IntDeserializer {
|
||||||
@@ -431,7 +431,7 @@ mod deserializer {
|
|||||||
pub struct U8Deserializer {
|
pub struct U8Deserializer {
|
||||||
state: State,
|
state: State,
|
||||||
len: uint,
|
len: uint,
|
||||||
iter: vec::MoveItems<u8>,
|
iter: vec::IntoIter<u8>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl U8Deserializer {
|
impl U8Deserializer {
|
||||||
|
|||||||
+2
-2
@@ -302,8 +302,8 @@ impl<D: de::Deserializer<E>, E> de::Deserialize<D, E> for Value {
|
|||||||
|
|
||||||
enum State {
|
enum State {
|
||||||
Value(Value),
|
Value(Value),
|
||||||
Array(vec::MoveItems<Value>),
|
Array(vec::IntoIter<Value>),
|
||||||
Object(btree_map::MoveEntries<String, Value>),
|
Object(btree_map::IntoIter<String, Value>),
|
||||||
End,
|
End,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user