Skip to content

Commit 7b6c711

Browse files
committed
---
yaml --- r: 152972 b: refs/heads/try2 c: 1e55dce h: refs/heads/master v: v3
1 parent 78888bf commit 7b6c711

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4c65a86571420ba79bc00028460e9625484e151a
8+
refs/heads/try2: 1e55dce0e40578ef0875044f5ce6371510b2e40c
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libserialize/json.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ pub enum Json {
246246
String(String),
247247
Boolean(bool),
248248
List(List),
249-
Object(Box<Object>),
249+
Object(Object),
250250
Null,
251251
}
252252

@@ -888,7 +888,7 @@ impl Json {
888888
/// Returns None otherwise.
889889
pub fn as_object<'a>(&'a self) -> Option<&'a Object> {
890890
match self {
891-
&Object(ref map) => Some(&**map),
891+
&Object(ref map) => Some(map),
892892
_ => None
893893
}
894894
}
@@ -1720,7 +1720,7 @@ impl<T: Iterator<char>> Builder<T> {
17201720
fn build_object(&mut self) -> Result<Json, BuilderError> {
17211721
self.bump();
17221722

1723-
let mut values = box TreeMap::new();
1723+
let mut values = TreeMap::new();
17241724

17251725
loop {
17261726
match self.token {
@@ -2117,7 +2117,7 @@ impl<A: ToJson> ToJson for TreeMap<String, A> {
21172117
for (key, value) in self.iter() {
21182118
d.insert((*key).clone(), value.to_json());
21192119
}
2120-
Object(box d)
2120+
Object(d)
21212121
}
21222122
}
21232123

@@ -2127,7 +2127,7 @@ impl<A: ToJson> ToJson for HashMap<String, A> {
21272127
for (key, value) in self.iter() {
21282128
d.insert((*key).clone(), value.to_json());
21292129
}
2130-
Object(box d)
2130+
Object(d)
21312131
}
21322132
}
21332133

@@ -2185,7 +2185,7 @@ mod tests {
21852185
}
21862186

21872187
fn mk_object(items: &[(String, Json)]) -> Json {
2188-
let mut d = box TreeMap::new();
2188+
let mut d = TreeMap::new();
21892189

21902190
for item in items.iter() {
21912191
match *item {
@@ -3252,7 +3252,7 @@ mod tests {
32523252
let mut tree_map = TreeMap::new();
32533253
tree_map.insert("a".to_string(), Number(1.0_f64));
32543254
tree_map.insert("b".to_string(), Number(2.0_f64));
3255-
Object(box tree_map)
3255+
Object(tree_map)
32563256
};
32573257

32583258
assert_eq!(list2.to_json(), list2);

0 commit comments

Comments
 (0)