bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge remote-tracking branch 'thestinger/old_map' into incoming

Browse source 
Conflicts:
	src/test/bench/core-map.rs
This commit is contained in:
Brian Anderson 2013-02-03 17:55:19 -08:00
commit 3b396d17d6
111 changed files with 528 additions and 641 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstd/json.rs
View file

@ -1162,18 +1162,6 @@ impl <A: ToJson Copy> LinearMap<~str, A>: ToJson {
}
}
/*
impl <A: ToJson Copy> @std::map::HashMap<~str, A>: ToJson {
fn to_json() -> Json {
let mut d = LinearMap::new();
for self.each_ref |key, value| {
d.insert(copy *key, value.to_json());
}
Object(~d)
}
}
*/
impl <A: ToJson> Option<A>: ToJson {
fn to_json() -> Json {
match self {