---

yaml
---
r: 30462
b: refs/heads/incoming
c: cb7a539
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 29003c799f41cce948bc043cdd1350ca4bee949e
+refs/heads/incoming: cb7a5395ddfaa7b8fc40db57b32c22f69780ccd6
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/rust.md

@@ -450,7 +450,7 @@ Two examples of paths with type arguments:
 # use std::map;
 # fn f() {
 # fn id<T:Copy>(t: T) -> T { t }
-type t = map::hashmap<int,~str>;  // Type arguments used in a type expression
+type t = map::HashMap<int,~str>;  // Type arguments used in a type expression
 let x = id::<int>(10);           // Type arguments used in a call expression
 # }
 ~~~~

branches/incoming/src/cargo/cargo.rs

@@ -10,7 +10,7 @@ use syntax::diagnostic;
 use result::{Ok, Err};
 use io::WriterUtil;
 use std::{map, json, tempfile, term, sort, getopts};
-use map::hashmap;
+use map::HashMap;
 use to_str::to_str;
 use getopts::{optflag, optopt, opt_present};
 
@@ -71,9 +71,9 @@ type cargo = {
     libdir: Path,
     workdir: Path,
     sourcedir: Path,
-    sources: map::hashmap<~str, source>,
+    sources: map::HashMap<~str, source>,
     mut current_install: ~str,
-    dep_cache: map::hashmap<~str, bool>,
+    dep_cache: map::HashMap<~str, bool>,
     opts: options
 };
 
@@ -454,7 +454,7 @@ fn parse_source(name: ~str, j: json::Json) -> source {
     };
 }
 
-fn try_parse_sources(filename: &Path, sources: map::hashmap<~str, source>) {
+fn try_parse_sources(filename: &Path, sources: map::HashMap<~str, source>) {
     if !os::path_exists(filename)  { return; }
     let c = io::read_whole_file_str(filename);
     match json::from_str(result::get(c)) {
@@ -469,7 +469,7 @@ fn try_parse_sources(filename: &Path, sources: map::hashmap<~str, source>) {
     }
 }
 
-fn load_one_source_package(src: source, p: map::hashmap<~str, json::Json>) {
+fn load_one_source_package(src: source, p: map::HashMap<~str, json::Json>) {
     let name = match p.find(~"name") {
         Some(json::String(n)) => {
             if !valid_pkg_name(*n) {

branches/incoming/src/libstd/json.rs

@@ -6,8 +6,8 @@
 use core::cmp::{Eq, Ord};
 use result::{Result, Ok, Err};
 use io::WriterUtil;
-use map::hashmap;
-use map::map;
+use map::HashMap;
+use map::Map;
 use sort::Sort;
 
 export Json;
@@ -34,7 +34,7 @@ enum Json {
     String(@~str),
     Boolean(bool),
     List(@~[Json]),
-    Dict(map::hashmap<~str, Json>),
+    Dict(map::HashMap<~str, Json>),
     Null,
 }
 
@@ -797,7 +797,7 @@ impl <A: ToJson> ~[A]: ToJson {
     fn to_json() -> Json { List(@self.map(|elt| elt.to_json())) }
 }
 
-impl <A: ToJson Copy> hashmap<~str, A>: ToJson {
+impl <A: ToJson Copy> HashMap<~str, A>: ToJson {
     fn to_json() -> Json {
         let d = map::str_hash();
         for self.each() |key, value| {