From 388ef3e80fa6720772fa9ffbc187ce0a3ad5802d Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Fri, 5 Dec 2014 22:17:50 -0800
Subject: [PATCH] fixup the benchmarks

---
 benches/bench_enum.rs   | 10 +++++-----
 benches/bench_map.rs    |  8 ++++----
 benches/bench_struct.rs | 24 ++++++++++++------------
 benches/bench_vec.rs    | 12 ++++++------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/benches/bench_enum.rs b/benches/bench_enum.rs
index a7ec4d07..926951b6 100644
--- a/benches/bench_enum.rs
+++ b/benches/bench_enum.rs
@@ -223,22 +223,22 @@ mod deserializer {
             match self.stack.pop() {
                 Some(AnimalState(Dog)) => {
                     self.stack.push(EndState);
-                    Some(Ok(de::EnumStart("Animal", "Dog", 0)))
+                    Some(Ok(de::Token::EnumStart("Animal", "Dog", 0)))
                 }
                 Some(AnimalState(Frog(x0, x1))) => {
                     self.stack.push(EndState);
                     self.stack.push(IntState(x1));
                     self.stack.push(StringState(x0));
-                    Some(Ok(de::EnumStart("Animal", "Frog", 2)))
+                    Some(Ok(de::Token::EnumStart("Animal", "Frog", 2)))
                 }
                 Some(IntState(x)) => {
-                    Some(Ok(de::Int(x)))
+                    Some(Ok(de::Token::Int(x)))
                 }
                 Some(StringState(x)) => {
-                    Some(Ok(de::String(x)))
+                    Some(Ok(de::Token::String(x)))
                 }
                 Some(EndState) => {
-                    Some(Ok(de::End))
+                    Some(Ok(de::Token::End))
                 }
                 None => None,
             }
diff --git a/benches/bench_map.rs b/benches/bench_map.rs
index 06482e36..cc1643bc 100644
--- a/benches/bench_map.rs
+++ b/benches/bench_map.rs
@@ -211,23 +211,23 @@ mod deserializer {
             match self.stack.pop() {
                 Some(StartState) => {
                     self.stack.push(KeyOrEndState);
-                    Some(Ok(de::MapStart(self.len)))
+                    Some(Ok(de::Token::MapStart(self.len)))
                 }
                 Some(KeyOrEndState) => {
                     match self.iter.next() {
                         Some((key, value)) => {
                             self.stack.push(ValueState(value));
-                            Some(Ok(de::String(key)))
+                            Some(Ok(de::Token::String(key)))
                         }
                         None => {
                             self.stack.push(EndState);
-                            Some(Ok(de::End))
+                            Some(Ok(de::Token::End))
                         }
                     }
                 }
                 Some(ValueState(x)) => {
                     self.stack.push(KeyOrEndState);
-                    Some(Ok(de::Int(x)))
+                    Some(Ok(de::Token::Int(x)))
                 }
                 Some(EndState) => {
                     None
diff --git a/benches/bench_struct.rs b/benches/bench_struct.rs
index 7afa6286..b818dae9 100644
--- a/benches/bench_struct.rs
+++ b/benches/bench_struct.rs
@@ -337,7 +337,7 @@ mod deserializer {
                     self.stack.push(EndState);
                     self.stack.push(VecState(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 })) => {
                     self.stack.push(EndState);
@@ -349,16 +349,16 @@ mod deserializer {
 
                     self.stack.push(NullState);
                     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)) => {
                     self.stack.push(EndState);
                     let len = value.len();
                     for inner in value.into_iter().rev() {
                         self.stack.push(InnerState(inner));
                     }
-                    Some(Ok(de::SeqStart(len)))
+                    Some(Ok(de::Token::SeqStart(len)))
                 }
                 Some(MapState(value)) => {
                     self.stack.push(EndState);
@@ -375,16 +375,16 @@ mod deserializer {
                         }
                         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(NullState) => Some(Ok(de::Null)),
-                Some(UintState(x)) => Some(Ok(de::Uint(x))),
-                Some(CharState(x)) => Some(Ok(de::Char(x))),
-                Some(StringState(x)) => Some(Ok(de::String(x))),
-                Some(OptionState(x)) => Some(Ok(de::Option(x))),
+                //Some(TupleState(len)) => Some(Ok(de::Token::TupleStart(len))),
+                Some(NullState) => Some(Ok(de::Token::Null)),
+                Some(UintState(x)) => Some(Ok(de::Token::Uint(x))),
+                Some(CharState(x)) => Some(Ok(de::Token::Char(x))),
+                Some(StringState(x)) => Some(Ok(de::Token::String(x))),
+                Some(OptionState(x)) => Some(Ok(de::Token::Option(x))),
                 Some(EndState) => {
-                    Some(Ok(de::End))
+                    Some(Ok(de::Token::End))
                 }
                 None => None,
             }
diff --git a/benches/bench_vec.rs b/benches/bench_vec.rs
index dd776995..aca12fd4 100644
--- a/benches/bench_vec.rs
+++ b/benches/bench_vec.rs
@@ -287,16 +287,16 @@ mod deserializer {
             match self.state {
                 StartState => {
                     self.state = SepOrEndState;
-                    Some(Ok(de::SeqStart(self.len)))
+                    Some(Ok(de::Token::SeqStart(self.len)))
                 }
                 SepOrEndState => {
                     match self.iter.next() {
                         Some(value) => {
-                            Some(Ok(de::Int(value)))
+                            Some(Ok(de::Token::Int(value)))
                         }
                         None => {
                             self.state = EndState;
-                            Some(Ok(de::End))
+                            Some(Ok(de::Token::End))
                         }
                     }
                 }
@@ -359,16 +359,16 @@ mod deserializer {
             match self.state {
                 StartState => {
                     self.state = SepOrEndState;
-                    Some(Ok(de::SeqStart(self.len)))
+                    Some(Ok(de::Token::SeqStart(self.len)))
                 }
                 SepOrEndState => {
                     match self.iter.next() {
                         Some(value) => {
-                            Some(Ok(de::U8(value)))
+                            Some(Ok(de::Token::U8(value)))
                         }
                         None => {
                             self.state = EndState;
-                            Some(Ok(de::End))
+                            Some(Ok(de::Token::End))
                         }
                     }
                 }