From 1e55dce0e40578ef0875044f5ce6371510b2e40c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adolfo=20Ochagav=C3=ADa?= Date: Sat, 28 Jun 2014 14:41:40 +0200 Subject: [PATCH] Removed unnecessary Box --- src/libserialize/json.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 0cbfd938e8c..1a5ff5dcdb7 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -246,7 +246,7 @@ pub enum Json { String(String), Boolean(bool), List(List), - Object(Box), + Object(Object), Null, } @@ -888,7 +888,7 @@ pub fn is_object<'a>(&'a self) -> bool { /// Returns None otherwise. pub fn as_object<'a>(&'a self) -> Option<&'a Object> { match self { - &Object(ref map) => Some(&**map), + &Object(ref map) => Some(map), _ => None } } @@ -1720,7 +1720,7 @@ fn build_list(&mut self) -> Result { fn build_object(&mut self) -> Result { self.bump(); - let mut values = box TreeMap::new(); + let mut values = TreeMap::new(); loop { match self.token { @@ -2117,7 +2117,7 @@ fn to_json(&self) -> Json { for (key, value) in self.iter() { d.insert((*key).clone(), value.to_json()); } - Object(box d) + Object(d) } } @@ -2127,7 +2127,7 @@ fn to_json(&self) -> Json { for (key, value) in self.iter() { d.insert((*key).clone(), value.to_json()); } - Object(box d) + Object(d) } } @@ -2185,7 +2185,7 @@ struct Outer { } fn mk_object(items: &[(String, Json)]) -> Json { - let mut d = box TreeMap::new(); + let mut d = TreeMap::new(); for item in items.iter() { match *item { @@ -3252,7 +3252,7 @@ fn test_to_json() { let mut tree_map = TreeMap::new(); tree_map.insert("a".to_string(), Number(1.0_f64)); tree_map.insert("b".to_string(), Number(2.0_f64)); - Object(box tree_map) + Object(tree_map) }; assert_eq!(list2.to_json(), list2); -- 2.44.0