Fixed all the tests

This commit is contained in:
kvark
2014-09-29 21:58:22 -04:00
parent bfd1fb0ee9
commit 997d3901c1
6 changed files with 50 additions and 44 deletions
+2 -2
View File
@@ -49,7 +49,7 @@ mod decoder {
pub fn new(values: HashMap<String, int>) -> IntDecoder {
IntDecoder {
len: values.len(),
iter: values.move_iter(),
iter: values.into_iter(),
stack: vec!(),
}
}
@@ -195,7 +195,7 @@ mod deserializer {
IntDeserializer {
stack: vec!(StartState),
len: values.len(),
iter: values.move_iter(),
iter: values.into_iter(),
}
}
}
+4 -4
View File
@@ -214,7 +214,7 @@ mod decoder {
match self.stack.pop() {
Some(VecState(value)) => {
let len = value.len();
for inner in value.move_iter().rev() {
for inner in value.into_iter().rev() {
self.stack.push(InnerState(inner));
}
f(self, len)
@@ -232,7 +232,7 @@ mod decoder {
match self.stack.pop() {
Some(MapState(map)) => {
let len = map.len();
for (key, value) in map.move_iter() {
for (key, value) in map.into_iter() {
match value {
Some(c) => {
self.stack.push(CharState(c));
@@ -322,7 +322,7 @@ mod deserializer {
Some(VecState(value)) => {
self.stack.push(EndState);
let len = value.len();
for inner in value.move_iter().rev() {
for inner in value.into_iter().rev() {
self.stack.push(InnerState(inner));
}
Some(Ok(de::SeqStart(len)))
@@ -330,7 +330,7 @@ mod deserializer {
Some(MapState(value)) => {
self.stack.push(EndState);
let len = value.len();
for (key, value) in value.move_iter() {
for (key, value) in value.into_iter() {
match value {
Some(c) => {
self.stack.push(CharState(c));
+4 -4
View File
@@ -41,7 +41,7 @@ mod decoder {
pub fn new(values: Vec<int>) -> IntDecoder {
IntDecoder {
len: values.len(),
iter: values.move_iter(),
iter: values.into_iter(),
}
}
}
@@ -146,7 +146,7 @@ mod decoder {
pub fn new(values: Vec<u8>) -> U8Decoder {
U8Decoder {
len: values.len(),
iter: values.move_iter(),
iter: values.into_iter(),
}
}
}
@@ -271,7 +271,7 @@ mod deserializer {
IntDeserializer {
state: StartState,
len: values.len(),
iter: values.move_iter(),
iter: values.into_iter(),
}
}
}
@@ -343,7 +343,7 @@ mod deserializer {
U8Deserializer {
state: StartState,
len: values.len(),
iter: values.move_iter(),
iter: values.into_iter(),
}
}
}