From 0bd4dc68e6f45a4ffe8e12642aa557638ab2f5bd Mon Sep 17 00:00:00 2001 From: Alexis Beingessner Date: Tue, 16 Dec 2014 23:09:16 -0500 Subject: s/Tree/BTree --- src/libserialize/collection_impls.rs | 14 +++++++------- src/libserialize/json.rs | 34 +++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/libserialize') diff --git a/src/libserialize/collection_impls.rs b/src/libserialize/collection_impls.rs index ffeb190ddf8..8fb025623d4 100644 --- a/src/libserialize/collection_impls.rs +++ b/src/libserialize/collection_impls.rs @@ -15,7 +15,7 @@ use std::default::Default; use std::hash::{Hash, Hasher}; use {Decodable, Encodable, Decoder, Encoder}; -use std::collections::{DList, RingBuf, TreeMap, TreeSet, HashMap, HashSet, +use std::collections::{DList, RingBuf, BTreeMap, BTreeSet, HashMap, HashSet, TrieMap, TrieSet, VecMap}; use std::collections::enum_set::{EnumSet, CLike}; @@ -78,7 +78,7 @@ impl< S: Encoder, K: Encodable + PartialEq + Ord, V: Encodable + PartialEq -> Encodable for TreeMap { +> Encodable for BTreeMap { fn encode(&self, e: &mut S) -> Result<(), E> { e.emit_map(self.len(), |e| { let mut i = 0; @@ -97,10 +97,10 @@ impl< D: Decoder, K: Decodable + PartialEq + Ord, V: Decodable + PartialEq -> Decodable for TreeMap { +> Decodable for BTreeMap { fn decode(d: &mut D) -> Result, E> { d.read_map(|d, len| { - let mut map = TreeMap::new(); + let mut map = BTreeMap::new(); for i in range(0u, len) { let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d))); let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d))); @@ -115,7 +115,7 @@ impl< E, S: Encoder, T: Encodable + PartialEq + Ord -> Encodable for TreeSet { +> Encodable for BTreeSet { fn encode(&self, s: &mut S) -> Result<(), E> { s.emit_seq(self.len(), |s| { let mut i = 0; @@ -132,10 +132,10 @@ impl< E, D: Decoder, T: Decodable + PartialEq + Ord -> Decodable for TreeSet { +> Decodable for BTreeSet { fn decode(d: &mut D) -> Result, E> { d.read_seq(|d, len| { - let mut set = TreeSet::new(); + let mut set = BTreeSet::new(); for i in range(0u, len) { set.insert(try!(d.read_seq_elt(i, |d| Decodable::decode(d)))); } diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index e7b2d0c8eba..6d143329b0c 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -151,7 +151,7 @@ //! //! ```rust //! extern crate serialize; -//! use std::collections::TreeMap; +//! use std::collections::BTreeMap; //! use serialize::json::{mod, Json, ToJson}; //! //! // Only generate `Decodable` trait implementation @@ -165,7 +165,7 @@ //! // Specify encoding method manually //! impl ToJson for TestStruct { //! fn to_json(&self) -> Json { -//! let mut d = TreeMap::new(); +//! let mut d = BTreeMap::new(); //! // All standard types implement `to_json()`, so use it //! d.insert("data_int".to_string(), self.data_int.to_json()); //! d.insert("data_str".to_string(), self.data_str.to_json()); @@ -198,7 +198,7 @@ use self::ParserState::*; use self::InternalStackElement::*; use std; -use std::collections::{HashMap, TreeMap}; +use std::collections::{HashMap, BTreeMap}; use std::{char, f64, fmt, io, num, str}; use std::mem::{swap, transmute}; use std::num::{Float, FPNaN, FPInfinite, Int}; @@ -223,7 +223,7 @@ pub enum Json { } pub type Array = Vec; -pub type Object = TreeMap; +pub type Object = BTreeMap; /// The errors that can arise while parsing a JSON stream. #[deriving(Clone, PartialEq)] @@ -973,7 +973,7 @@ impl Json { self.as_object().is_some() } - /// If the Json value is an Object, returns the associated TreeMap. + /// If the Json value is an Object, returns the associated BTreeMap. /// Returns None otherwise. pub fn as_object<'a>(&'a self) -> Option<&'a Object> { match self { @@ -1909,7 +1909,7 @@ impl> Builder { fn build_object(&mut self) -> Result { self.bump(); - let mut values = TreeMap::new(); + let mut values = BTreeMap::new(); loop { match self.token { @@ -2391,9 +2391,9 @@ impl ToJson for Vec { fn to_json(&self) -> Json { Json::Array(self.iter().map(|elt| elt.to_json()).collect()) } } -impl ToJson for TreeMap { +impl ToJson for BTreeMap { fn to_json(&self) -> Json { - let mut d = TreeMap::new(); + let mut d = BTreeMap::new(); for (key, value) in self.iter() { d.insert((*key).clone(), value.to_json()); } @@ -2403,7 +2403,7 @@ impl ToJson for TreeMap { impl ToJson for HashMap { fn to_json(&self) -> Json { - let mut d = TreeMap::new(); + let mut d = BTreeMap::new(); for (key, value) in self.iter() { d.insert((*key).clone(), value.to_json()); } @@ -2451,7 +2451,7 @@ mod tests { use super::{PrettyEncoder, Json, from_str, DecodeResult, DecoderError, JsonEvent, Parser, StackElement, Stack, Encoder, Decoder}; use std::{i64, u64, f32, f64, io}; - use std::collections::TreeMap; + use std::collections::BTreeMap; use std::num::Float; use std::string; @@ -2501,7 +2501,7 @@ mod tests { } fn mk_object(items: &[(string::String, Json)]) -> Json { - let mut d = TreeMap::new(); + let mut d = BTreeMap::new(); for item in items.iter() { match *item { @@ -3075,7 +3075,7 @@ mod tests { fn test_decode_map() { let s = "{\"a\": \"Dog\", \"b\": {\"variant\":\"Frog\",\ \"fields\":[\"Henry\", 349]}}"; - let mut map: TreeMap = super::decode(s).unwrap(); + let mut map: BTreeMap = super::decode(s).unwrap(); assert_eq!(map.remove(&"a".into_string()), Some(Dog)); assert_eq!(map.remove(&"b".into_string()), Some(Frog("Henry".into_string(), 349))); @@ -3350,9 +3350,9 @@ mod tests { #[test] fn test_prettyencoder_indent_level_param() { use std::str::from_utf8; - use std::collections::TreeMap; + use std::collections::BTreeMap; - let mut tree = TreeMap::new(); + let mut tree = BTreeMap::new(); tree.insert("hello".into_string(), String("guten tag".into_string())); tree.insert("goodbye".into_string(), String("sayonara".into_string())); @@ -3719,13 +3719,13 @@ mod tests { #[test] fn test_to_json() { - use std::collections::{HashMap,TreeMap}; + use std::collections::{HashMap,BTreeMap}; use super::ToJson; let array2 = Array(vec!(U64(1), U64(2))); let array3 = Array(vec!(U64(1), U64(2), U64(3))); let object = { - let mut tree_map = TreeMap::new(); + let mut tree_map = BTreeMap::new(); tree_map.insert("a".into_string(), U64(1)); tree_map.insert("b".into_string(), U64(2)); Object(tree_map) @@ -3758,7 +3758,7 @@ mod tests { assert_eq!((&[1u, 2, 3]).to_json(), array3); assert_eq!((vec![1u, 2]).to_json(), array2); assert_eq!(vec!(1u, 2, 3).to_json(), array3); - let mut tree_map = TreeMap::new(); + let mut tree_map = BTreeMap::new(); tree_map.insert("a".into_string(), 1u); tree_map.insert("b".into_string(), 2); assert_eq!(tree_map.to_json(), object); -- cgit 1.4.1-3-g733a5