itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-09-30 14:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update serde2 to rust HEAD

Browse Source
This commit is contained in:
Erick Tryzelaar 2014-12-13 16:58:31 -08:00
parent 246396fdb4
commit c75f5caf8f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
serde2/benches/bench_log.rs
View File

@ -141,7 +141,7 @@ impl<
}
}
#[deriving(Show, PartialEq, FromPrimitive)]
#[deriving(Copy, Show, PartialEq, FromPrimitive)]
enum HttpProtocol {
HTTP_PROTOCOL_UNKNOWN,
HTTP10,
@ -185,7 +185,7 @@ impl<
}
}
#[deriving(Show, PartialEq, FromPrimitive)]
#[deriving(Copy, Show, PartialEq, FromPrimitive)]
enum HttpMethod {
METHOD_UNKNOWN,
GET,
@ -237,7 +237,7 @@ impl<
}
}
#[deriving(Show, PartialEq, FromPrimitive)]
#[deriving(Copy, Show, PartialEq, FromPrimitive)]
enum CacheStatus {
CACHESTATUS_UNKNOWN,
Miss,
@ -370,7 +370,7 @@ impl<
}
}
#[deriving(Show, PartialEq, FromPrimitive)]
#[deriving(Copy, Show, PartialEq, FromPrimitive)]
enum OriginProtocol {
ORIGIN_PROTOCOL_UNKNOWN,
HTTP,
@ -411,7 +411,7 @@ impl<S: de::Deserializer<E>, E: de::Error> de::Deserialize<S, E> for OriginProto
}
}
#[deriving(Show, PartialEq, FromPrimitive)]
#[deriving(Copy, Show, PartialEq, FromPrimitive)]
enum ZonePlan {
ZONEPLAN_UNKNOWN,
FREE,
@ -454,7 +454,7 @@ impl<S: de::Deserializer<E>, E: de::Error> de::Deserialize<S, E> for ZonePlan {
}
}
#[deriving(Show, PartialEq, FromPrimitive)]
#[deriving(Copy, Show, PartialEq, FromPrimitive)]
enum Country {
UNKNOWN,
A1,

4
serde2/src/json/de.rs
View File

@ -638,8 +638,8 @@ mod tests {
("\"\\n\"", "\n".to_string()),
("\"\\r\"", "\r".to_string()),
("\"\\t\"", "\t".to_string()),
("\"\\u12ab\"", "\u12ab".to_string()),
("\"\\uAB12\"", "\uAB12".to_string()),
("\"\\u12ab\"", "\u{12ab}".to_string()),
("\"\\uAB12\"", "\u{AB12}".to_string()),
]);
}

2
serde2/src/json/error.rs
View File

@ -5,7 +5,7 @@ use std::io;
use de;
/// The errors that can arise while parsing a JSON stream.
#[deriving(Clone, PartialEq)]
#[deriving(Copy, Clone, PartialEq)]
pub enum ErrorCode {
EOFWhileParsingList,
EOFWhileParsingObject,