pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-25 15:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace StructField with Str/String. 2322ns vs 2982ns

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-05-26 08:26:34 -07:00
parent 4b8c62828e
commit 8587bb3a4c
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
de.rs
+17 -13
View File
@@ -28,7 +28,6 @@ pub enum Token {
TupleStart(uint),
StructStart(&'static str),
StructField(&'static str),
EnumStart(&'static str, &'static str),
@@ -192,15 +191,20 @@ pub trait Deserializer<E>: Iterator<Result<Token, E>> {
};
match token {
StructField(n) => {
if name == n {
Deserializable::deserialize(self)
} else {
Err(self.syntax_error())
Str(n) => {
if name != n {
return Err(self.syntax_error());
}
}
_ => Err(self.syntax_error()),
String(n) => {
if name != n.as_slice() {
return Err(self.syntax_error());
}
}
_ => { return Err(self.syntax_error()); }
}
Deserializable::deserialize(self)
}
#[inline]
@@ -492,7 +496,7 @@ mod tests {
use serialize::Decoder;
use super::{Token, Null, Int, Uint, Str, String, Char, Option};
use super::{TupleStart, StructStart, StructField, EnumStart};
use super::{TupleStart, StructStart, EnumStart};
use super::{SeqStart, MapStart, End};
use super::{Deserializer, Deserializable};
@@ -737,7 +741,7 @@ mod tests {
fn test_tokens_struct_empty() {
let tokens = vec!(
StructStart("Outer"),
StructField("inner"),
Str("inner"),
SeqStart(0),
End,
End,
@@ -753,16 +757,16 @@ mod tests {
fn test_tokens_struct() {
let tokens = vec!(
StructStart("Outer"),
StructField("inner"),
Str("inner"),
SeqStart(1),
StructStart("Inner"),
StructField("a"),
Str("a"),
Null,
StructField("b"),
Str("b"),
Uint(5),
StructField("c"),
Str("c"),
MapStart(1),
TupleStart(2),
String("abc".to_strbuf()),