libstd: Change HashMap::new and HashSet::new to HashMap::init and

`HashSet::init` respectively

Author: pcwalton

src/libextra/stats.rs

@@ -372,7 +372,7 @@ pub fn write_boxplot(w: &mut io::Writer, s: &Summary, width_hint: uint) {
 /// Returns a HashMap with the number of occurrences of every element in the
 /// sequence that the iterator exposes.
 pub fn freq_count<T: Iterator<U>, U: Eq+Hash>(mut iter: T) -> hashmap::HashMap<U, uint> {
-    let mut map: hashmap::HashMap<U,uint> = hashmap::HashMap::new();
+    let mut map: hashmap::HashMap<U,uint> = hashmap::HashMap::init();
     for elem in iter {
         map.insert_or_update_with(elem, 1, |_, count| *count += 1);
     }

src/libextra/terminfo/parser/compiled.rs

@@ -222,7 +222,7 @@ pub fn parse(file: &mut io::Reader,
 
     debug!("term names: {:?}", term_names);
 
-    let mut bools_map = HashMap::new();
+    let mut bools_map = HashMap::init();
     if bools_bytes != 0 {
         for i in range(0, bools_bytes) {
             let b = file.read_byte().unwrap();
@@ -243,7 +243,7 @@ pub fn parse(file: &mut io::Reader,
         file.read_byte(); // compensate for padding
     }
 
-    let mut numbers_map = HashMap::new();
+    let mut numbers_map = HashMap::init();
     if numbers_count != 0 {
         for i in range(0, numbers_count) {
             let n = file.read_le_u16();
@@ -256,7 +256,7 @@ pub fn parse(file: &mut io::Reader,
 
     debug!("numbers: {:?}", numbers_map);
 
-    let mut string_map = HashMap::new();
+    let mut string_map = HashMap::init();
 
     if string_offsets_count != 0 {
         let mut string_offsets = vec::with_capacity(10);

src/libextra/url.rs

@@ -245,7 +245,7 @@ pub fn encode_form_urlencoded(m: &HashMap<~str, ~[~str]>) -> ~str {
  */
 pub fn decode_form_urlencoded(s: &[u8]) -> HashMap<~str, ~[~str]> {
     let mut rdr = BufReader::new(s);
-    let mut m = HashMap::new();
+    let mut m = HashMap::init();
     let mut key = ~"";
     let mut value = ~"";
     let mut parsing_key = true;
@@ -1086,18 +1086,18 @@ mod tests {
 
     #[test]
     fn test_encode_form_urlencoded() {
-        let mut m = HashMap::new();
+        let mut m = HashMap::init();
         assert_eq!(encode_form_urlencoded(&m), ~"");
 
         m.insert(~"", ~[]);
         m.insert(~"foo", ~[]);
         assert_eq!(encode_form_urlencoded(&m), ~"");
 
-        let mut m = HashMap::new();
+        let mut m = HashMap::init();
         m.insert(~"foo", ~[~"bar", ~"123"]);
         assert_eq!(encode_form_urlencoded(&m), ~"foo=bar&foo=123");
 
-        let mut m = HashMap::new();
+        let mut m = HashMap::init();
         m.insert(~"foo bar", ~[~"abc", ~"12 = 34"]);
         assert!(encode_form_urlencoded(&m) ==
             ~"foo+bar=abc&foo+bar=12+%3D+34");

src/librustc/back/rpath.rs

@@ -156,7 +156,7 @@ pub fn get_install_prefix_rpath(target_triple: &str) -> ~str {
 }
 
 pub fn minimize_rpaths(rpaths: &[~str]) -> ~[~str] {
-    let mut set = HashSet::new();
+    let mut set = HashSet::init();
     let mut minimized = ~[];
     for rpath in rpaths.iter() {
         if set.insert(rpath.as_slice()) {

src/librustc/driver/driver.rs

@@ -843,7 +843,7 @@ pub fn build_session_(sopts: @session::options,
         filesearch: filesearch,
         building_library: @mut false,
         working_dir: os::getcwd(),
-        lints: @mut HashMap::new(),
+        lints: @mut HashMap::init(),
         node_id: @mut 1
     }
 }

src/librustc/driver/session.rs

@@ -368,7 +368,7 @@ pub fn basic_options() -> @options {
         save_temps: false,
         jit: false,
         output_type: link::output_type_exe,
-        addl_lib_search_paths: @mut HashSet::new(),
+        addl_lib_search_paths: @mut HashSet::init(),
         linker: None,
         linker_args: ~[],
         maybe_sysroot: None,

src/librustc/lib/llvm.rs

@@ -1775,8 +1775,8 @@ pub struct TypeNames {
 impl TypeNames {
     pub fn new() -> TypeNames {
         TypeNames {
-            type_names: HashMap::new(),
-            named_types: HashMap::new()
+            type_names: HashMap::init(),
+            named_types: HashMap::init()
         }
     }
 

src/librustc/metadata/creader.rs

@@ -324,7 +324,7 @@ fn resolve_crate_deps(e: @mut Env, cdata: @~[u8]) -> cstore::cnum_map {
     debug!("resolving deps of external crate");
     // The map from crate numbers in the crate we're resolving to local crate
     // numbers
-    let mut cnum_map = HashMap::new();
+    let mut cnum_map = HashMap::init();
     let r = decoder::get_crate_deps(cdata);
     for dep in r.iter() {
         let extrn_cnum = dep.cnum;

src/librustc/metadata/cstore.rs

@@ -48,8 +48,8 @@ type extern_mod_crate_map = HashMap<ast::NodeId, ast::CrateNum>;
 
 pub fn mk_cstore(intr: @ident_interner) -> CStore {
     return CStore {
-        metas: HashMap::new(),
-        extern_mod_crate_map: HashMap::new(),
+        metas: HashMap::init(),
+        extern_mod_crate_map: HashMap::init(),
         used_crate_files: ~[],
         used_libraries: ~[],
         used_link_args: ~[],

src/librustc/metadata/encoder.rs

@@ -1771,7 +1771,7 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
         non_inlineable_statics,
         _
     } = parms;
-    let type_abbrevs = @mut HashMap::new();
+    let type_abbrevs = @mut HashMap::init();
     let stats = @mut stats;
     let ecx = EncodeContext {
         diag: diag,

src/librustc/metadata/filesearch.rs

@@ -53,7 +53,7 @@ pub fn mk_filesearch(maybe_sysroot: &Option<@Path>,
         fn sysroot(&self) -> @Path { self.sysroot }
 
         fn for_each_lib_search_path(&self, f: |&Path| -> FileMatch) {
-            let mut visited_dirs = HashSet::new();
+            let mut visited_dirs = HashSet::init();
             let mut found = false;
 
             debug!("filesearch: searching additional lib search paths [{:?}]",

src/librustc/middle/borrowck/check_loans.rs

@@ -72,7 +72,7 @@ pub fn check_loans(bccx: &BorrowckCtxt,
         dfcx_loans: dfcx_loans,
         move_data: @move_data,
         all_loans: all_loans,
-        reported: @mut HashSet::new(),
+        reported: @mut HashSet::init(),
     };
 
     clcx.visit_block(body, ());

src/librustc/middle/borrowck/mod.rs

@@ -82,9 +82,9 @@ pub fn check_crate(
         moved_variables_set: moved_variables_set,
         capture_map: capture_map,
         root_map: root_map(),
-        loan_map: @mut HashMap::new(),
-        write_guard_map: @mut HashSet::new(),
-        stmt_map: @mut HashSet::new(),
+        loan_map: @mut HashMap::init(),
+        write_guard_map: @mut HashSet::init(),
+        stmt_map: @mut HashSet::init(),
         stats: @mut BorrowStats {
             loaned_paths_same: 0,
             loaned_paths_imm: 0,
@@ -417,7 +417,7 @@ pub struct RootInfo {
 pub type root_map = @mut HashMap<root_map_key, RootInfo>;
 
 pub fn root_map() -> root_map {
-    return @mut HashMap::new();
+    return @mut HashMap::init();
 }
 
 pub enum DynaFreezeKind {

src/librustc/middle/borrowck/move_data.rs

@@ -166,11 +166,11 @@ impl MoveData {
     pub fn new() -> MoveData {
         MoveData {
             paths: ~[],
-            path_map: HashMap::new(),
+            path_map: HashMap::init(),
             moves: ~[],
             path_assignments: ~[],
             var_assignments: ~[],
-            assignee_ids: HashSet::new(),
+            assignee_ids: HashSet::init(),
         }
     }
 

src/librustc/middle/cfg/construct.rs

@@ -35,7 +35,7 @@ pub fn construct(tcx: ty::ctxt,
                  method_map: typeck::method_map,
                  blk: &ast::Block) -> CFG {
     let mut cfg_builder = CFGBuilder {
-        exit_map: HashMap::new(),
+        exit_map: HashMap::init(),
         graph: graph::Graph::new(),
         tcx: tcx,
         method_map: method_map,

src/librustc/middle/const_eval.rs

@@ -116,11 +116,11 @@ pub fn lookup_variant_by_id(tcx: ty::ctxt,
             None => {}
         }
         let maps = astencode::Maps {
-            root_map: @mut HashMap::new(),
-            method_map: @mut HashMap::new(),
-            vtable_map: @mut HashMap::new(),
-            write_guard_map: @mut HashSet::new(),
-            capture_map: @mut HashMap::new()
+            root_map: @mut HashMap::init(),
+            method_map: @mut HashMap::init(),
+            vtable_map: @mut HashMap::init(),
+            write_guard_map: @mut HashSet::init(),
+            capture_map: @mut HashMap::init()
         };
         let e = match csearch::maybe_get_item_ast(tcx, enum_def,
             |a, b, c, d| astencode::decode_inlined_item(a,
@@ -159,11 +159,11 @@ pub fn lookup_const_by_id(tcx: ty::ctxt,
             None => {}
         }
         let maps = astencode::Maps {
-            root_map: @mut HashMap::new(),
-            method_map: @mut HashMap::new(),
-            vtable_map: @mut HashMap::new(),
-            write_guard_map: @mut HashSet::new(),
-            capture_map: @mut HashMap::new()
+            root_map: @mut HashMap::init(),
+            method_map: @mut HashMap::init(),
+            vtable_map: @mut HashMap::init(),
+            write_guard_map: @mut HashSet::init(),
+            capture_map: @mut HashMap::init()
         };
         let e = match csearch::maybe_get_item_ast(tcx, def_id,
             |a, b, c, d| astencode::decode_inlined_item(a, b, maps, c, d)) {
@@ -280,7 +280,7 @@ pub fn process_crate(crate: &ast::Crate,
                      tcx: ty::ctxt) {
     let mut v = ConstEvalVisitor {
         tcx: tcx,
-        ccache: HashMap::new(),
+        ccache: HashMap::init(),
     };
     visit::walk_crate(&mut v, crate, ());
     tcx.sess.abort_if_errors();

src/librustc/middle/dataflow.rs

@@ -142,7 +142,7 @@ impl<O:DataFlowOperator> DataFlowContext<O> {
             tcx: tcx,
             method_map: method_map,
             words_per_id: words_per_id,
-            nodeid_to_bitset: HashMap::new(),
+            nodeid_to_bitset: HashMap::init(),
             bits_per_id: bits_per_id,
             oper: oper,
             gens: gens,

src/librustc/middle/freevars.rs

@@ -90,7 +90,7 @@ impl Visitor<int> for CollectFreevarsVisitor {
 // in order to start the search.
 fn collect_freevars(def_map: resolve::DefMap, blk: &ast::Block)
     -> freevar_info {
-    let seen = @mut HashMap::new();
+    let seen = @mut HashMap::init();
     let refs = @mut ~[];
 
     let mut v = CollectFreevarsVisitor {
@@ -124,7 +124,7 @@ impl Visitor<()> for AnnotateFreevarsVisitor {
 // one pass. This could be improved upon if it turns out to matter.
 pub fn annotate_freevars(def_map: resolve::DefMap, crate: &ast::Crate) ->
    freevar_map {
-    let freevars = @mut HashMap::new();
+    let freevars = @mut HashMap::init();
 
     let mut visitor = AnnotateFreevarsVisitor {
         def_map: def_map,

src/librustc/middle/lang_items.rs

@@ -334,7 +334,7 @@ impl<'self> Visitor<()> for LanguageItemVisitor<'self> {
 
 impl LanguageItemCollector {
     pub fn new(session: Session) -> LanguageItemCollector {
-        let mut item_refs = HashMap::new();
+        let mut item_refs = HashMap::init();
 
         item_refs.insert("freeze", FreezeTraitLangItem as uint);
         item_refs.insert("send", SendTraitLangItem as uint);

src/librustc/middle/lint.rs

@@ -320,7 +320,7 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
   '-' to '_' in command-line flags
  */
 pub fn get_lint_dict() -> LintDict {
-    let mut map = HashMap::new();
+    let mut map = HashMap::init();
     for &(k, v) in lint_table.iter() {
         map.insert(k, v);
     }

src/librustc/middle/liveness.rs

@@ -263,9 +263,9 @@ fn IrMaps(tcx: ty::ctxt,
         capture_map: capture_map,
         num_live_nodes: 0,
         num_vars: 0,
-        live_node_map: HashMap::new(),
-        variable_map: HashMap::new(),
-        capture_info_map: HashMap::new(),
+        live_node_map: HashMap::init(),
+        variable_map: HashMap::init(),
+        capture_info_map: HashMap::init(),
         var_kinds: ~[],
         lnks: ~[],
     }
@@ -603,8 +603,8 @@ fn Liveness(ir: @mut IrMaps, specials: Specials) -> Liveness {
         users: @mut vec::from_elem(ir.num_live_nodes * ir.num_vars,
                                    invalid_users()),
         loop_scope: @mut ~[],
-        break_ln: @mut HashMap::new(),
-        cont_ln: @mut HashMap::new()
+        break_ln: @mut HashMap::init(),
+        cont_ln: @mut HashMap::init()
     }
 }
 

src/librustc/middle/moves.rs

@@ -212,9 +212,9 @@ pub fn compute_moves(tcx: ty::ctxt,
         tcx: tcx,
         method_map: method_map,
         move_maps: MoveMaps {
-            moves_map: @mut HashSet::new(),
-            capture_map: @mut HashMap::new(),
-            moved_variables_set: @mut HashSet::new()
+            moves_map: @mut HashSet::init(),
+            capture_map: @mut HashMap::init(),
+            moved_variables_set: @mut HashSet::init()
         }
     };
     let visit_cx = &mut visit_cx;

src/librustc/middle/pat_util.rs

@@ -21,7 +21,7 @@ pub type PatIdMap = HashMap<Ident, NodeId>;
 // This is used because same-named variables in alternative patterns need to
 // use the NodeId of their namesake in the first pattern.
 pub fn pat_id_map(dm: resolve::DefMap, pat: @Pat) -> PatIdMap {
-    let mut map = HashMap::new();
+    let mut map = HashMap::init();
     pat_bindings(dm, pat, |_bm, p_id, _s, n| {
       map.insert(path_to_ident(n), p_id);
     });

src/librustc/middle/privacy.rs

@@ -950,9 +950,9 @@ pub fn check_crate(tcx: ty::ctxt,
                    external_exports: resolve::ExternalExports,
                    last_private_map: resolve::LastPrivateMap,
                    crate: &ast::Crate) -> ExportedItems {
-    let mut parents = HashMap::new();
-    let mut path_all_public_items = HashSet::new();
-    let mut exported_items = HashSet::new();
+    let mut parents = HashMap::init();
+    let mut path_all_public_items = HashSet::init();
+    let mut exported_items = HashSet::init();
 
     // First, figure out who everyone's parent is
     {

src/librustc/middle/reachable.rs

@@ -174,7 +174,7 @@ impl ReachableContext {
         ReachableContext {
             tcx: tcx,
             method_map: method_map,
-            reachable_symbols: @mut HashSet::new(),
+            reachable_symbols: @mut HashSet::init(),
             worklist: @mut ~[],
         }
     }
@@ -253,7 +253,7 @@ impl ReachableContext {
     // Step 2: Mark all symbols that the symbols on the worklist touch.
     fn propagate(&self) {
         let mut visitor = self.init_visitor();
-        let mut scanned = HashSet::new();
+        let mut scanned = HashSet::init();
         while self.worklist.len() > 0 {
             let search_item = self.worklist.pop();
             if scanned.contains(&search_item) {

src/librustc/middle/region.rs

@@ -498,9 +498,9 @@ pub fn resolve_crate(sess: Session,
                      crate: &ast::Crate) -> @mut RegionMaps
 {
     let region_maps = @mut RegionMaps {
-        scope_map: HashMap::new(),
-        free_region_map: HashMap::new(),
-        cleanup_scopes: HashSet::new(),
+        scope_map: HashMap::init(),
+        free_region_map: HashMap::init(),
+        cleanup_scopes: HashSet::init(),
     };
     let cx = Context {parent: None,
                       var_parent: None};