From dac51fe4d20fc40168b954d3cd96ef549ad5d215 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sat, 31 May 2014 12:28:30 -0700 Subject: [PATCH] Update to rust HEAD (2f221c) --- bench_enum.rs | 2 +- bench_map.rs | 6 +++--- bench_struct.rs | 4 ++-- bench_vec.rs | 6 +++--- de.rs | 10 +++++----- json.rs | 22 +++++++++++----------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bench_enum.rs b/bench_enum.rs index 7e2a7dd5..05cc88b9 100644 --- a/bench_enum.rs +++ b/bench_enum.rs @@ -6,7 +6,7 @@ use de::{Deserializer, Deserializable, Token}; ////////////////////////////////////////////////////////////////////////////// -#[deriving(Clone, Eq, Show, Decodable)] +#[deriving(Clone, PartialEq, Show, Decodable)] enum Animal { Dog, Frog(String, int) diff --git a/bench_map.rs b/bench_map.rs index c0b0a456..7eaaf2c7 100644 --- a/bench_map.rs +++ b/bench_map.rs @@ -160,7 +160,7 @@ mod deserializer { use de; - #[deriving(Eq, Show)] + #[deriving(PartialEq, Show)] enum State { StartState, KeyOrEndState, @@ -237,7 +237,7 @@ mod deserializer { fn run_decoder< E: Show, D: Decoder, - T: Clone + Eq + Show + Decodable + T: Clone + PartialEq + Show + Decodable >(mut d: D, value: T) { let v: T = Decodable::decode(&mut d).unwrap(); @@ -277,7 +277,7 @@ fn bench_decoder_100(b: &mut Bencher) { fn run_deserializer< E: Show, D: Deserializer, - T: Clone + Eq + Show + Deserializable + T: Clone + PartialEq + Show + Deserializable >(mut d: D, value: T) { let v: T = Deserializable::deserialize(&mut d).unwrap(); diff --git a/bench_struct.rs b/bench_struct.rs index 9b884b53..32f2f013 100644 --- a/bench_struct.rs +++ b/bench_struct.rs @@ -8,7 +8,7 @@ use de::{Token, Deserializer, Deserializable}; ////////////////////////////////////////////////////////////////////////////// -#[deriving(Clone, Eq, Show, Decodable)] +#[deriving(Clone, PartialEq, Show, Decodable)] struct Inner { a: (), b: uint, @@ -74,7 +74,7 @@ impl> Deserializable for Inner { ////////////////////////////////////////////////////////////////////////////// -#[deriving(Clone, Eq, Show, Decodable)] +#[deriving(Clone, PartialEq, Show, Decodable)] struct Outer { inner: Vec, } diff --git a/bench_vec.rs b/bench_vec.rs index d354b88e..331fe91d 100644 --- a/bench_vec.rs +++ b/bench_vec.rs @@ -232,7 +232,7 @@ mod deserializer { use de; - #[deriving(Eq, Show)] + #[deriving(PartialEq, Show)] enum State { StartState, SepOrEndState, @@ -355,7 +355,7 @@ mod deserializer { fn run_decoder< E: Show, D: Decoder, - T: Clone + Eq + Show + Decodable + T: Clone + PartialEq + Show + Decodable >(mut d: D, value: T) { let v: T = Decodable::decode(&mut d).unwrap(); @@ -365,7 +365,7 @@ fn run_decoder< fn run_deserializer< E: Show, D: Deserializer, - T: Clone + Eq + Show + Deserializable + T: Clone + PartialEq + Show + Deserializable >(mut d: D, value: T) { let v: T = Deserializable::deserialize(&mut d).unwrap(); diff --git a/de.rs b/de.rs index fad31e39..eac5b2bd 100644 --- a/de.rs +++ b/de.rs @@ -4,7 +4,7 @@ use std::hash::Hash; use std::num; use collections::{HashMap, TreeMap}; -#[deriving(Clone, Eq, Show)] +#[deriving(Clone, PartialEq, Show)] pub enum Token { Null, Bool(bool), @@ -413,7 +413,7 @@ impl< impl< E, D: Deserializer, - K: Deserializable + Eq + TotalOrd, + K: Deserializable + TotalOrd, V: Deserializable > Deserializable for TreeMap { #[inline] @@ -690,7 +690,7 @@ mod tests { ////////////////////////////////////////////////////////////////////////////// - #[deriving(Clone, Eq, Show, Decodable)] + #[deriving(Clone, PartialEq, Show, Decodable)] struct Inner { a: (), b: uint, @@ -711,7 +711,7 @@ mod tests { ////////////////////////////////////////////////////////////////////////////// - #[deriving(Clone, Eq, Show, Decodable)] + #[deriving(Clone, PartialEq, Show, Decodable)] struct Outer { inner: Vec, } @@ -728,7 +728,7 @@ mod tests { ////////////////////////////////////////////////////////////////////////////// - #[deriving(Clone, Eq, Show, Decodable)] + #[deriving(Clone, PartialEq, Show, Decodable)] enum Animal { Dog, Frog(String, int) diff --git a/json.rs b/json.rs index a09c84c0..571090d6 100644 --- a/json.rs +++ b/json.rs @@ -252,7 +252,7 @@ use serialize; use serialize::{Encoder, Encodable}; /// Represents a json value -#[deriving(Clone, Eq)] +#[deriving(Clone, PartialEq)] pub enum Json { Null, Boolean(bool), @@ -491,7 +491,7 @@ impl de::Deserializer for JsonDeserializer { } /// The errors that can arise while parsing a JSON stream. -#[deriving(Clone, Eq)] +#[deriving(Clone, PartialEq)] pub enum ErrorCode { EOFWhileParsingList, EOFWhileParsingObject, @@ -513,7 +513,7 @@ pub enum ErrorCode { UnrecognizedHex, } -#[deriving(Clone, Eq, Show)] +#[deriving(Clone, PartialEq, Show)] pub enum ParserError { /// msg, line, col SyntaxError(ErrorCode, uint, uint), @@ -1230,7 +1230,7 @@ pub enum JsonEvent { } */ -#[deriving(Eq, Show)] +#[deriving(PartialEq, Show)] enum ParserState { // Parse a value. ParseValue, @@ -2347,7 +2347,7 @@ impl ::Decoder for Decoder { */ /// Test if two json values are less than one another -impl Ord for Json { +impl PartialOrd for Json { fn lt(&self, other: &Json) -> bool { match *self { Number(f0) => { @@ -2577,7 +2577,7 @@ mod tests { }) } - #[deriving(Eq, Show)] + #[deriving(PartialEq, Show)] enum Animal { Dog, Frog(String, int) @@ -2620,7 +2620,7 @@ mod tests { } } - #[deriving(Eq, Show)] + #[deriving(PartialEq, Show)] struct Inner { a: (), b: uint, @@ -2696,7 +2696,7 @@ mod tests { } } - #[deriving(Eq, Show)] + #[deriving(PartialEq, Show)] struct Outer { inner: Vec, } @@ -3009,7 +3009,7 @@ mod tests { // FIXME (#5527): these could be merged once UFCS is finished. fn test_parse_err< 'a, - T: Eq + Show + de::Deserializable>> + T: Show + de::Deserializable>> >(errors: &[(&'a str, ParserError)]) { for &(s, ref err) in errors.iter() { let v: Result = from_iter(s.chars()); @@ -3019,7 +3019,7 @@ mod tests { fn test_parse_ok< 'a, - T: Eq + Show + ToJson + de::Deserializable>> + T: PartialEq + Show + ToJson + de::Deserializable>> >(errors: &[(&'a str, T)]) { for &(s, ref value) in errors.iter() { let v: T = from_iter(s.chars()).unwrap(); @@ -3031,7 +3031,7 @@ mod tests { } fn test_json_deserialize_ok< - T: Eq + Show + ToJson + de::Deserializable + T: PartialEq + Show + ToJson + de::Deserializable >(errors: &[T]) { for value in errors.iter() { let v: T = from_json(value.to_json()).unwrap();