bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #8312 : alexcrichton/rust/use-treemap, r=erickt

Browse source 
Closes #4430
This commit is contained in:
bors 2013-08-06 07:05:05 -07:00
commit ba3d03d3a4
1 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libextra/json.rs
View file

@ -26,7 +26,6 @@ use std::to_str;
use serialize::Encodable;
use serialize;
use sort::Sort;
use treemap::TreeMap;
/// Represents a json value
@ -1152,23 +1151,7 @@ impl Ord for Json {
Object(ref d0) => {
match *other {
Number(_) | String(_) | Boolean(_) | List(_) => false,
Object(ref d1) => {
let mut d0_flat = ~[];
let mut d1_flat = ~[];
// FIXME #4430: this is horribly inefficient...
for (k, v) in d0.iter() {
d0_flat.push((@(*k).clone(), @(*v).clone()));
}
d0_flat.qsort();
for (k, v) in d1.iter() {
d1_flat.push((@(*k).clone(), @(*v).clone()));
}
d1_flat.qsort();
d0_flat < d1_flat
}
Object(ref d1) => d0 < d1,
Null => true
}
}