auto merge of #4854 : thestinger/rust/oldmap, r=catamorphism

Author: bors

src/libcargo/cargo.rc

@@ -730,7 +730,7 @@ pub fn configure(opts: Options) -> Cargo {
     need_dir(&c.libdir);
     need_dir(&c.bindir);
 
-    for sources.each_key_ref |&k| {
+    for sources.each_key |&k| {
         let mut s = sources.get(&k);
         load_source_packages(&c, s);
         sources.insert(k, s);
@@ -748,7 +748,7 @@ pub fn configure(opts: Options) -> Cargo {
 }
 
 pub fn for_each_package(c: &Cargo, b: fn(s: @Source, p: &Package)) {
-    for c.sources.each_value_ref |&v| {
+    for c.sources.each_value |&v| {
         for v.packages.each |p| {
             b(v, p);
         }
@@ -1155,7 +1155,7 @@ pub fn cmd_install(c: &mut Cargo) {
 }
 
 pub fn sync(c: &Cargo) {
-    for c.sources.each_key_ref |&k| {
+    for c.sources.each_key |&k| {
         let mut s = c.sources.get(&k);
         sync_one(c, s);
         c.sources.insert(k, s);
@@ -1569,7 +1569,7 @@ pub fn cmd_list(c: &Cargo) {
             }
         }
     } else {
-        for c.sources.each_value_ref |&v| {
+        for c.sources.each_value |&v| {
             print_source(v);
         }
     }
@@ -1636,7 +1636,7 @@ pub fn dump_sources(c: &Cargo) {
         result::Ok(writer) => {
             let mut hash = ~LinearMap::new();
 
-            for c.sources.each_ref |&k, &v| {
+            for c.sources.each |&k, &v| {
                 let mut chash = ~LinearMap::new();
 
                 chash.insert(~"url", json::String(v.url));
@@ -1675,7 +1675,7 @@ pub fn copy_warn(srcfile: &Path, destfile: &Path) {
 
 pub fn cmd_sources(c: &Cargo) {
     if vec::len(c.opts.free) < 3u {
-        for c.sources.each_value_ref |&v| {
+        for c.sources.each_value |&v| {
             info(fmt!("%s (%s) via %s",
                       v.name, v.url, v.method));
         }
@@ -1686,7 +1686,7 @@ pub fn cmd_sources(c: &Cargo) {
 
     match action {
         ~"clear" => {
-          for c.sources.each_key_ref |&k| {
+          for c.sources.each_key |&k| {
                 c.sources.remove(&k);
             }
 
@@ -1706,7 +1706,7 @@ pub fn cmd_sources(c: &Cargo) {
                 return;
             }
 
-            if c.sources.contains_key_ref(&name) {
+            if c.sources.contains_key(&name) {
                 error(fmt!("source already exists: %s", name));
             } else {
                 c.sources.insert(name, @Source {
@@ -1733,7 +1733,7 @@ pub fn cmd_sources(c: &Cargo) {
                 return;
             }
 
-            if c.sources.contains_key_ref(&name) {
+            if c.sources.contains_key(&name) {
                 c.sources.remove(&name);
                 info(fmt!("removed source: %s", name));
             } else {

src/librustc/back/rpath.rs

@@ -18,8 +18,7 @@ use core::os;
 use core::uint;
 use core::util;
 use core::vec;
-use std::oldmap::HashMap;
-use std::oldmap;
+use core::hashmap::linear::LinearSet;
 
 pure fn not_win32(os: session::os) -> bool {
   match os {
@@ -187,16 +186,14 @@ pub fn get_install_prefix_rpath(target_triple: &str) -> Path {
 }
 
 pub fn minimize_rpaths(rpaths: &[Path]) -> ~[Path] {
-    let set = oldmap::HashMap();
+    let mut set = LinearSet::new();
     let mut minimized = ~[];
     for rpaths.each |rpath| {
-        let s = rpath.to_str();
-        if !set.contains_key_ref(&s) {
-            minimized.push(/*bad*/copy *rpath);
-            set.insert(s, ());
+        if set.insert(rpath.to_str()) {
+            minimized.push(copy *rpath);
         }
     }
-    return minimized;
+    minimized
 }
 
 #[cfg(unix)]

src/librustc/metadata/cstore.rs

@@ -86,13 +86,13 @@ pub fn set_crate_data(cstore: @mut CStore,
 }
 
 pub fn have_crate_data(cstore: @mut CStore, cnum: ast::crate_num) -> bool {
-    return cstore.metas.contains_key_ref(&cnum);
+    cstore.metas.contains_key(&cnum)
 }
 
 pub fn iter_crate_data(cstore: @mut CStore,
                        i: fn(ast::crate_num, crate_metadata)) {
     let metas = cstore.metas;
-    for metas.each_ref |&k, &v| {
+    for metas.each |&k, &v| {
         i(k, v);
     }
 }
@@ -148,7 +148,7 @@ pub fn get_dep_hashes(cstore: @mut CStore) -> ~[~str] {
     let mut result = ~[];
 
     let use_crate_map = cstore.use_crate_map;
-    for use_crate_map.each_value_ref |&cnum| {
+    for use_crate_map.each_value |&cnum| {
         let cdata = cstore::get_crate_data(cstore, cnum);
         let hash = decoder::get_crate_hash(cdata.data);
         debug!("Add hash[%s]: %s", cdata.name, hash);

src/librustc/metadata/encoder.rs

@@ -99,7 +99,7 @@ pub enum encode_ctxt = {
 };
 
 pub fn reachable(ecx: @encode_ctxt, id: node_id) -> bool {
-    ecx.reachable.contains_key_ref(&id)
+    ecx.reachable.contains_key(&id)
 }
 
 fn encode_name(ecx: @encode_ctxt, ebml_w: writer::Encoder, name: ident) {

src/librustc/middle/borrowck/check_loans.rs

@@ -689,7 +689,7 @@ fn check_loans_in_expr(expr: @ast::expr,
 
     self.check_for_conflicting_loans(expr.id);
 
-    if self.bccx.moves_map.contains_key_ref(&expr.id) {
+    if self.bccx.moves_map.contains_key(&expr.id) {
         self.check_move_out_from_expr(expr);
     }
 
@@ -710,15 +710,15 @@ fn check_loans_in_expr(expr: @ast::expr,
       }
       ast::expr_index(_, rval) |
       ast::expr_binary(_, _, rval)
-      if self.bccx.method_map.contains_key_ref(&expr.id) => {
+      if self.bccx.method_map.contains_key(&expr.id) => {
         self.check_call(expr,
                         None,
                         expr.callee_id,
                         expr.span,
                         ~[rval]);
       }
       ast::expr_unary(*) | ast::expr_index(*)
-      if self.bccx.method_map.contains_key_ref(&expr.id) => {
+      if self.bccx.method_map.contains_key(&expr.id) => {
         self.check_call(expr,
                         None,
                         expr.callee_id,

src/librustc/middle/borrowck/gather_loans.rs

@@ -207,7 +207,7 @@ fn req_loans_in_expr(ex: @ast::expr,
       ast::expr_binary(_, rcvr, _) |
       ast::expr_unary(_, rcvr) |
       ast::expr_assign_op(_, rcvr, _)
-      if self.bccx.method_map.contains_key_ref(&ex.id) => {
+      if self.bccx.method_map.contains_key(&ex.id) => {
         // Receivers in method calls are always passed by ref.
         //
         // Here, in an overloaded operator, the call is this expression,
@@ -244,7 +244,7 @@ fn req_loans_in_expr(ex: @ast::expr,
       // }
 
       ast::expr_field(rcvr, _, _)
-      if self.bccx.method_map.contains_key_ref(&ex.id) => {
+      if self.bccx.method_map.contains_key(&ex.id) => {
         // Receivers in method calls are always passed by ref.
         //
         // Here, the field a.b is in fact a closure.  Eventually, this

src/librustc/middle/borrowck/preserve.rs

@@ -375,7 +375,7 @@ impl PreserveCtxt {
                 // scope_id;`. Though that would potentially re-introduce
                 // the ICE. See #3511 for more details.
                 let scope_to_use = if
-                    self.bccx.stmt_map.contains_key_ref(&scope_id) {
+                    self.bccx.stmt_map.contains_key(&scope_id) {
                     // Root it in its parent scope, b/c
                     // trans won't introduce a new scope for the
                     // stmt

src/librustc/middle/check_const.rs

@@ -102,7 +102,7 @@ pub fn check_expr(sess: Session,
           }
           expr_lit(@codemap::spanned {node: lit_str(_), _}) => { }
           expr_binary(_, _, _) | expr_unary(_, _) => {
-            if method_map.contains_key_ref(&e.id) {
+            if method_map.contains_key(&e.id) {
                 sess.span_err(e.span, ~"user-defined operators are not \
                                        allowed in constant expressions");
             }

src/librustc/middle/check_match.rs

@@ -59,7 +59,7 @@ pub fn expr_is_non_moving_lvalue(cx: @MatchCheckCtxt, expr: @expr) -> bool {
         return false;
     }
 
-    !cx.moves_map.contains_key_ref(&expr.id)
+    !cx.moves_map.contains_key(&expr.id)
 }
 
 pub fn check_expr(cx: @MatchCheckCtxt, ex: @expr, &&s: (), v: visit::vt<()>) {
@@ -734,7 +734,7 @@ pub fn check_legality_of_move_bindings(cx: @MatchCheckCtxt,
                     by_ref_span = Some(span);
                 }
                 bind_infer => {
-                    if cx.moves_map.contains_key_ref(&id) {
+                    if cx.moves_map.contains_key(&id) {
                         any_by_move = true;
                     }
                 }
@@ -774,7 +774,7 @@ pub fn check_legality_of_move_bindings(cx: @MatchCheckCtxt,
             if pat_is_binding(def_map, p) {
                 match p.node {
                     pat_ident(_, _, sub) => {
-                        if cx.moves_map.contains_key_ref(&p.id) {
+                        if cx.moves_map.contains_key(&p.id) {
                             check_move(p, sub);
                         }
                     }
@@ -800,7 +800,7 @@ pub fn check_legality_of_move_bindings(cx: @MatchCheckCtxt,
                                 behind_bad_pointer);
 
                         if behind_bad_pointer &&
-                            cx.moves_map.contains_key_ref(&pat.id)
+                            cx.moves_map.contains_key(&pat.id)
                         {
                             cx.tcx.sess.span_err(
                                 pat.span,

src/librustc/middle/freevars.rs

@@ -69,7 +69,7 @@ fn collect_freevars(def_map: resolve::DefMap, blk: ast::blk)
                       }
                       if i == depth { // Made it to end of loop
                         let dnum = ast_util::def_id_of_def(def).node;
-                        if !seen.contains_key_ref(&dnum) {
+                        if !seen.contains_key(&dnum) {
                             refs.push(@freevar_entry {
                                 def: def,
                                 span: expr.span,