From 512a54e983e388e925f0bfe4d29f4e9d6fb9859d Mon Sep 17 00:00:00 2001 From: Thomas Bahn Date: Tue, 23 Dec 2014 18:33:37 +0100 Subject: [PATCH] Replace TreeMap with BTreeMap in the serde2 --- serde2/src/bin.rs | 10 +++++----- serde2/src/de.rs | 12 ++++++------ serde2/src/json/builder.rs | 14 +++++++------- serde2/src/json/de.rs | 6 +++--- serde2/src/json/value.rs | 8 ++++---- serde2/src/ser.rs | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/serde2/src/bin.rs b/serde2/src/bin.rs index 8653afe8..c844bcb6 100644 --- a/serde2/src/bin.rs +++ b/serde2/src/bin.rs @@ -253,7 +253,7 @@ impl< /////////////////////////////////////////////////////////////////////////////// mod json { - use std::collections::TreeMap; + use std::collections::BTreeMap; use serde2::de; #[deriving(Show)] @@ -263,7 +263,7 @@ mod json { Int(int), //String(String), List(Vec), - Map(TreeMap), + Map(BTreeMap), } impl< @@ -323,7 +323,7 @@ mod json { fn visit_map< Visitor: de::MapVisitor, >(&mut self, mut visitor: Visitor) -> Result { - let mut values = TreeMap::new(); + let mut values = BTreeMap::new(); loop { match try!(visitor.visit()) { @@ -500,7 +500,7 @@ pub fn main() { /* -use std::collections::TreeMap; +use std::collections::BTreeMap; use serde::{Serialize, GatherTokens}; use serde::json; @@ -578,7 +578,7 @@ fn main() { //// - let mut value = TreeMap::new(); + let mut value = BTreeMap::new(); value.insert("a", 1i); value.insert("b", 2); value.insert("c", 3); diff --git a/serde2/src/de.rs b/serde2/src/de.rs index f320a6b1..17ce0904 100644 --- a/serde2/src/de.rs +++ b/serde2/src/de.rs @@ -1,4 +1,4 @@ -use std::collections::{HashMap, TreeMap}; +use std::collections::{HashMap, BTreeMap}; use std::hash::Hash; /////////////////////////////////////////////////////////////////////////////// @@ -472,8 +472,8 @@ impl< V: Deserialize, S: Deserializer, E: Error, -> Deserialize for TreeMap { - fn deserialize(state: &mut S) -> Result, E> { +> Deserialize for BTreeMap { + fn deserialize(state: &mut S) -> Result, E> { struct Visitor; impl< @@ -481,11 +481,11 @@ impl< V: Deserialize, S: Deserializer, E: Error, - > self::Visitor, E> for Visitor { + > self::Visitor, E> for Visitor { fn visit_map< Visitor: MapVisitor, - >(&mut self, mut visitor: Visitor) -> Result, E> { - let mut values = TreeMap::new(); + >(&mut self, mut visitor: Visitor) -> Result, E> { + let mut values = BTreeMap::new(); loop { match try!(visitor.visit()) { diff --git a/serde2/src/json/builder.rs b/serde2/src/json/builder.rs index c66b63bc..bed044da 100644 --- a/serde2/src/json/builder.rs +++ b/serde2/src/json/builder.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::collections::TreeMap; use std::str::StrAllocating; +use std::collections::BTreeMap; use ser::{mod, Serialize}; use json::value::{mod, Value}; @@ -46,12 +46,12 @@ impl ArrayBuilder { } pub struct ObjectBuilder { - object: TreeMap, + object: BTreeMap, } impl ObjectBuilder { pub fn new() -> ObjectBuilder { - ObjectBuilder { object: TreeMap::new() } + ObjectBuilder { object: BTreeMap::new() } } pub fn unwrap(self) -> Value { @@ -78,7 +78,7 @@ impl ObjectBuilder { #[cfg(test)] mod tests { - use std::collections::TreeMap; + use std::collections::BTreeMap; use json::value::Value; use super::{ArrayBuilder, ObjectBuilder}; @@ -107,7 +107,7 @@ mod tests { .insert("b".to_string(), 2i)) .unwrap(); - let mut map = TreeMap::new(); + let mut map = BTreeMap::new(); map.insert("a".to_string(), Value::I64(1)); map.insert("b".to_string(), Value::I64(2)); assert_eq!(value, Value::Array(vec!(Value::Object(map)))); @@ -116,14 +116,14 @@ mod tests { #[test] fn test_object_builder() { let value = ObjectBuilder::new().unwrap(); - assert_eq!(value, Value::Object(TreeMap::new())); + assert_eq!(value, Value::Object(BTreeMap::new())); let value = ObjectBuilder::new() .insert("a".to_string(), 1i) .insert("b".to_string(), 2i) .unwrap(); - let mut map = TreeMap::new(); + let mut map = BTreeMap::new(); map.insert("a".to_string(), Value::I64(1)); map.insert("b".to_string(), Value::I64(2)); assert_eq!(value, Value::Object(map)); diff --git a/serde2/src/json/de.rs b/serde2/src/json/de.rs index f2625072..3bdc52d7 100644 --- a/serde2/src/json/de.rs +++ b/serde2/src/json/de.rs @@ -529,7 +529,7 @@ pub fn from_str< mod tests { use std::str; use std::fmt::Show; - use std::collections::TreeMap; + use std::collections::BTreeMap; use de::Deserialize; use super::{Parser, from_str}; @@ -537,7 +537,7 @@ mod tests { macro_rules! treemap { ($($k:expr => $v:expr),*) => ({ - let mut _m = TreeMap::new(); + let mut _m = BTreeMap::new(); $(_m.insert($k, $v);)* _m }) @@ -694,7 +694,7 @@ mod tests { #[test] fn test_parse_object() { - test_parse_err::>(vec![ + test_parse_err::>(vec![ ("{", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 2)), ("{ ", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 3)), ("{1", Error::SyntaxError(ErrorCode::KeyMustBeAString, 1, 2)), diff --git a/serde2/src/json/value.rs b/serde2/src/json/value.rs index 821dcca8..ea700dff 100644 --- a/serde2/src/json/value.rs +++ b/serde2/src/json/value.rs @@ -1,4 +1,4 @@ -use std::collections::TreeMap; +use std::collections::BTreeMap; use std::fmt; use std::io; @@ -12,7 +12,7 @@ pub enum Value { F64(f64), String(String), Array(Vec), - Object(TreeMap), + Object(BTreeMap), } impl ser::Serialize for Value { @@ -77,7 +77,7 @@ pub fn to_value< enum State { Value(Value), Array(Vec), - Object(TreeMap), + Object(BTreeMap), } pub struct Writer { @@ -203,7 +203,7 @@ impl ser::Visitor for Visitor { fn visit_map< V: ser::MapVisitor >(&self, state: &mut Writer, mut visitor: V) -> Result<(), ()> { - let values = TreeMap::new(); + let values = BTreeMap::new(); state.state.push(State::Object(values)); diff --git a/serde2/src/ser.rs b/serde2/src/ser.rs index 95875df8..6a97a1f9 100644 --- a/serde2/src/ser.rs +++ b/serde2/src/ser.rs @@ -1,4 +1,4 @@ -use std::collections::TreeMap; +use std::collections::BTreeMap; /////////////////////////////////////////////////////////////////////////////// @@ -491,7 +491,7 @@ impl< impl< K: Serialize + Ord, V: Serialize, -> Serialize for TreeMap { +> Serialize for BTreeMap { #[inline] fn visit< S,