pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-09 20:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup the benchmarks

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-12-05 22:17:50 -08:00
parent 8b9da64e29
commit 388ef3e80f
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
benches/bench_enum.rs
+5 -5
View File
@@ -223,22 +223,22 @@ mod deserializer {
match self.stack.pop() { match self.stack.pop() {
Some(AnimalState(Dog)) => { Some(AnimalState(Dog)) => {
self.stack.push(EndState); self.stack.push(EndState);
Some(Ok(de::EnumStart("Animal", "Dog", 0))) Some(Ok(de::Token::EnumStart("Animal", "Dog", 0)))
} }
Some(AnimalState(Frog(x0, x1))) => { Some(AnimalState(Frog(x0, x1))) => {
self.stack.push(EndState); self.stack.push(EndState);
self.stack.push(IntState(x1)); self.stack.push(IntState(x1));
self.stack.push(StringState(x0)); self.stack.push(StringState(x0));
Some(Ok(de::EnumStart("Animal", "Frog", 2))) Some(Ok(de::Token::EnumStart("Animal", "Frog", 2)))
} }
Some(IntState(x)) => { Some(IntState(x)) => {
Some(Ok(de::Int(x))) Some(Ok(de::Token::Int(x)))
} }
Some(StringState(x)) => { Some(StringState(x)) => {
Some(Ok(de::String(x))) Some(Ok(de::Token::String(x)))
} }
Some(EndState) => { Some(EndState) => {
Some(Ok(de::End)) Some(Ok(de::Token::End))
} }
None => None, None => None,
} }
benches/bench_map.rs
+4 -4
View File
@@ -211,23 +211,23 @@ mod deserializer {
match self.stack.pop() { match self.stack.pop() {
Some(StartState) => { Some(StartState) => {
self.stack.push(KeyOrEndState); self.stack.push(KeyOrEndState);
Some(Ok(de::MapStart(self.len))) Some(Ok(de::Token::MapStart(self.len)))
} }
Some(KeyOrEndState) => { Some(KeyOrEndState) => {
match self.iter.next() { match self.iter.next() {
Some((key, value)) => { Some((key, value)) => {
self.stack.push(ValueState(value)); self.stack.push(ValueState(value));
Some(Ok(de::String(key))) Some(Ok(de::Token::String(key)))
} }
None => { None => {
self.stack.push(EndState); self.stack.push(EndState);
Some(Ok(de::End)) Some(Ok(de::Token::End))
} }
} }
} }
Some(ValueState(x)) => { Some(ValueState(x)) => {
self.stack.push(KeyOrEndState); self.stack.push(KeyOrEndState);
Some(Ok(de::Int(x))) Some(Ok(de::Token::Int(x)))
} }
Some(EndState) => { Some(EndState) => {
None None
benches/bench_struct.rs
+12 -12
View File
@@ -337,7 +337,7 @@ mod deserializer {
self.stack.push(EndState); self.stack.push(EndState);
self.stack.push(VecState(inner)); self.stack.push(VecState(inner));
self.stack.push(FieldState("inner")); self.stack.push(FieldState("inner"));
Some(Ok(de::StructStart("Outer", 1))) Some(Ok(de::Token::StructStart("Outer", 1)))
} }
Some(InnerState(Inner { a: (), b, c })) => { Some(InnerState(Inner { a: (), b, c })) => {
self.stack.push(EndState); self.stack.push(EndState);
@@ -349,16 +349,16 @@ mod deserializer {
self.stack.push(NullState); self.stack.push(NullState);
self.stack.push(FieldState("a")); self.stack.push(FieldState("a"));
Some(Ok(de::StructStart("Inner", 3))) Some(Ok(de::Token::StructStart("Inner", 3)))
} }
Some(FieldState(name)) => Some(Ok(de::Str(name))), Some(FieldState(name)) => Some(Ok(de::Token::Str(name))),
Some(VecState(value)) => { Some(VecState(value)) => {
self.stack.push(EndState); self.stack.push(EndState);
let len = value.len(); let len = value.len();
for inner in value.into_iter().rev() { for inner in value.into_iter().rev() {
self.stack.push(InnerState(inner)); self.stack.push(InnerState(inner));
} }
Some(Ok(de::SeqStart(len))) Some(Ok(de::Token::SeqStart(len)))
} }
Some(MapState(value)) => { Some(MapState(value)) => {
self.stack.push(EndState); self.stack.push(EndState);
@@ -375,16 +375,16 @@ mod deserializer {
} }
self.stack.push(StringState(key)); self.stack.push(StringState(key));
} }
Some(Ok(de::MapStart(len))) Some(Ok(de::Token::MapStart(len)))
} }
//Some(TupleState(len)) => Some(Ok(de::TupleStart(len))), //Some(TupleState(len)) => Some(Ok(de::Token::TupleStart(len))),
Some(NullState) => Some(Ok(de::Null)), Some(NullState) => Some(Ok(de::Token::Null)),
Some(UintState(x)) => Some(Ok(de::Uint(x))), Some(UintState(x)) => Some(Ok(de::Token::Uint(x))),
Some(CharState(x)) => Some(Ok(de::Char(x))), Some(CharState(x)) => Some(Ok(de::Token::Char(x))),
Some(StringState(x)) => Some(Ok(de::String(x))), Some(StringState(x)) => Some(Ok(de::Token::String(x))),
Some(OptionState(x)) => Some(Ok(de::Option(x))), Some(OptionState(x)) => Some(Ok(de::Token::Option(x))),
Some(EndState) => { Some(EndState) => {
Some(Ok(de::End)) Some(Ok(de::Token::End))
} }
None => None, None => None,
} }
benches/bench_vec.rs
+6 -6
View File
@@ -287,16 +287,16 @@ mod deserializer {
match self.state { match self.state {
StartState => { StartState => {
self.state = SepOrEndState; self.state = SepOrEndState;
Some(Ok(de::SeqStart(self.len))) Some(Ok(de::Token::SeqStart(self.len)))
} }
SepOrEndState => { SepOrEndState => {
match self.iter.next() { match self.iter.next() {
Some(value) => { Some(value) => {
Some(Ok(de::Int(value))) Some(Ok(de::Token::Int(value)))
} }
None => { None => {
self.state = EndState; self.state = EndState;
Some(Ok(de::End)) Some(Ok(de::Token::End))
} }
} }
} }
@@ -359,16 +359,16 @@ mod deserializer {
match self.state { match self.state {
StartState => { StartState => {
self.state = SepOrEndState; self.state = SepOrEndState;
Some(Ok(de::SeqStart(self.len))) Some(Ok(de::Token::SeqStart(self.len)))
} }
SepOrEndState => { SepOrEndState => {
match self.iter.next() { match self.iter.next() {
Some(value) => { Some(value) => {
Some(Ok(de::U8(value))) Some(Ok(de::Token::U8(value)))
} }
None => { None => {
self.state = EndState; self.state = EndState;
Some(Ok(de::End)) Some(Ok(de::Token::End))
} }
} }
} }