auto merge of #5095 : thestinger/rust/smallintmap, r=catamorphism

Closes #4738.

The `std::smallintmap` module doesn't use an implicit @ box so I just added that explicitly for now to make porting simple.

Author: bors

src/librustc/middle/astencode.rs

@@ -860,7 +860,7 @@ fn encode_side_tables_for_id(ecx: @e::EncodeContext,
             }
         }
     }
-    do option::iter(&(*tcx.node_types).find(id as uint)) |ty| {
+    do option::iter(&tcx.node_types.find(&(id as uint))) |&ty| {
         do ebml_w.tag(c::tag_table_node_type) {
             ebml_w.id(id);
             do ebml_w.tag(c::tag_table_val) {
@@ -1135,7 +1135,7 @@ fn decode_side_tables(xcx: @ExtendedDecodeContext,
                 let ty = val_dsr.read_ty(xcx);
                 debug!("inserting ty for node %?: %s",
                        id, ty_to_str(dcx.tcx, ty));
-                (*dcx.tcx.node_types).insert(id as uint, ty);
+                dcx.tcx.node_types.insert(id as uint, ty);
             } else if tag == (c::tag_table_node_type_subst as uint) {
                 let tys = val_dsr.read_tys(xcx);
                 dcx.tcx.node_type_substs.insert(id, tys);

src/librustc/middle/lint.rs

@@ -34,8 +34,7 @@ use core::uint;
 use core::vec;
 use std::oldmap::{Map, HashMap};
 use std::oldmap;
-use std::oldsmallintmap::{Map, SmallIntMap};
-use std::oldsmallintmap;
+use std::smallintmap::SmallIntMap;
 use syntax::ast_util::{path_to_ident};
 use syntax::attr;
 use syntax::codemap::span;
@@ -275,7 +274,7 @@ pub fn get_lint_dict() -> LintDict {
 }
 
 // This is a highly not-optimal set of data structure decisions.
-type LintModes = SmallIntMap<level>;
+type LintModes = @mut SmallIntMap<level>;
 type LintModeMap = HashMap<ast::node_id, LintModes>;
 
 // settings_map maps node ids of items with non-default lint settings
@@ -288,14 +287,14 @@ pub struct LintSettings {
 
 pub fn mk_lint_settings() -> LintSettings {
     LintSettings {
-        default_settings: oldsmallintmap::mk(),
+        default_settings: @mut SmallIntMap::new(),
         settings_map: HashMap()
     }
 }
 
 pub fn get_lint_level(modes: LintModes, lint: lint) -> level {
-    match modes.find(lint as uint) {
-      Some(c) => c,
+    match modes.find(&(lint as uint)) {
+      Some(&c) => c,
       None => allow
     }
 }
@@ -314,8 +313,7 @@ pub fn get_lint_settings_level(settings: LintSettings,
 // This is kind of unfortunate. It should be somewhere else, or we should use
 // a persistent data structure...
 fn clone_lint_modes(modes: LintModes) -> LintModes {
-    oldsmallintmap::SmallIntMap_(@oldsmallintmap::SmallIntMap_
-    {v: copy modes.v})
+    @mut (copy *modes)
 }
 
 struct Context {
@@ -332,7 +330,7 @@ impl Context {
 
     fn set_level(&self, lint: lint, level: level) {
         if level == allow {
-            self.curr.remove(lint as uint);
+            self.curr.remove(&(lint as uint));
         } else {
             self.curr.insert(lint as uint, level);
         }
@@ -440,7 +438,7 @@ fn build_settings_item(i: @ast::item, &&cx: Context, v: visit::vt<Context>) {
 pub fn build_settings_crate(sess: session::Session, crate: @ast::crate) {
     let cx = Context {
         dict: get_lint_dict(),
-        curr: oldsmallintmap::mk(),
+        curr: @mut SmallIntMap::new(),
         is_default: true,
         sess: sess
     };
@@ -458,7 +456,7 @@ pub fn build_settings_crate(sess: session::Session, crate: @ast::crate) {
 
     do cx.with_lint_attrs(/*bad*/copy crate.node.attrs) |cx| {
         // Copy out the default settings
-        for cx.curr.each |k, v| {
+        for cx.curr.each |&(k, &v)| {
             sess.lint_settings.default_settings.insert(k, v);
         }
 

src/librustc/middle/trans/base.rs

@@ -76,7 +76,6 @@ use core::option::{is_none, is_some};
 use core::option;
 use core::uint;
 use std::oldmap::HashMap;
-use std::oldsmallintmap;
 use std::{oldmap, time, list};
 use syntax::ast_map::{path, path_elt_to_str, path_mod, path_name};
 use syntax::ast_util::{def_id_of_def, local_def, path_to_ident};

src/librustc/middle/ty.rs

@@ -42,7 +42,8 @@ use core::uint;
 use core::vec;
 use core::hashmap::linear::LinearMap;
 use std::oldmap::HashMap;
-use std::{oldmap, oldsmallintmap};
+use std::oldmap;
+use std::smallintmap::SmallIntMap;
 use syntax::ast::*;
 use syntax::ast_util::{is_local, local_def};
 use syntax::ast_util;
@@ -767,7 +768,7 @@ type type_cache = HashMap<ast::def_id, ty_param_bounds_and_ty>;
 
 type constness_cache = HashMap<ast::def_id, const_eval::constness>;
 
-pub type node_type_table = @oldsmallintmap::SmallIntMap<t>;
+pub type node_type_table = @mut SmallIntMap<t>;
 
 fn mk_rcache() -> creader_cache {
     type val = {cnum: int, pos: uint, len: uint};
@@ -812,7 +813,7 @@ pub fn mk_ctxt(s: session::Session,
         def_map: dm,
         region_map: region_map,
         region_paramd_items: region_paramd_items,
-        node_types: @oldsmallintmap::mk(),
+        node_types: @mut SmallIntMap::new(),
         node_type_substs: oldmap::HashMap(),
         items: amap,
         intrinsic_defs: oldmap::HashMap(),
@@ -2787,8 +2788,8 @@ pub fn br_hashmap<V:Copy>() -> HashMap<bound_region, V> {
 
 pub fn node_id_to_type(cx: ctxt, id: ast::node_id) -> t {
     //io::println(fmt!("%?/%?", id, cx.node_types.len()));
-    match oldsmallintmap::find(*cx.node_types, id as uint) {
-       Some(t) => t,
+    match cx.node_types.find(&(id as uint)) {
+       Some(&t) => t,
        None => cx.sess.bug(
            fmt!("node_id_to_type: no type for node `%s`",
                 ast_map::node_id_to_str(cx.items, id,
@@ -3179,8 +3180,8 @@ pub fn expr_kind(tcx: ctxt,
         }
 
         ast::expr_cast(*) => {
-            match oldsmallintmap::find(*tcx.node_types, expr.id as uint) {
-                Some(t) => {
+            match tcx.node_types.find(&(expr.id as uint)) {
+                Some(&t) => {
                     if ty::type_is_immediate(t) {
                         RvalueDatumExpr
                     } else {

src/librustc/middle/typeck/infer/mod.rs

@@ -277,7 +277,7 @@ use core::result;
 use core::vec;
 use std::list::Nil;
 use std::oldmap::HashMap;
-use std::oldsmallintmap;
+use std::smallintmap::SmallIntMap;
 use syntax::ast::{ret_style, purity};
 use syntax::ast::{m_const, m_imm, m_mutbl};
 use syntax::ast::{unsafe_fn, impure_fn, pure_fn, extern_fn};
@@ -353,7 +353,7 @@ pub fn fixup_err_to_str(f: fixup_err) -> ~str {
 
 fn new_ValsAndBindings<V:Copy,T:Copy>() -> ValsAndBindings<V, T> {
     ValsAndBindings {
-        vals: oldsmallintmap::mk(),
+        vals: @mut SmallIntMap::new(),
         bindings: ~[]
     }
 }

src/librustc/middle/typeck/infer/unify.rs

@@ -10,7 +10,7 @@
 
 use core::prelude::*;
 use core::result;
-use std::oldsmallintmap::SmallIntMap;
+use std::smallintmap::SmallIntMap;
 
 use middle::ty::{Vid, expected_found, IntVarValue};
 use middle::ty;
@@ -27,7 +27,7 @@ pub enum VarValue<V, T> {
 }
 
 pub struct ValsAndBindings<V, T> {
-    vals: SmallIntMap<VarValue<V, T>>,
+    vals: @mut SmallIntMap<VarValue<V, T>>,
     bindings: ~[(V, VarValue<V, T>)],
 }
 
@@ -64,12 +64,12 @@ pub impl InferCtxt {
             vid: V) -> Node<V, T>
         {
             let vid_u = vid.to_uint();
-            match vb.vals.find(vid_u) {
+            match vb.vals.find(&vid_u) {
                 None => {
                     tcx.sess.bug(fmt!(
                         "failed lookup of vid `%u`", vid_u));
                 }
-                Some(ref var_val) => {
+                Some(var_val) => {
                     match *var_val {
                         Redirect(vid) => {
                             let node: Node<V,T> = helper(tcx, vb, vid);
@@ -103,8 +103,8 @@ pub impl InferCtxt {
 
         { // FIXME(#4903)---borrow checker is not flow sensitive
             let vb = UnifyVid::appropriate_vals_and_bindings(self);
-            let old_v = vb.vals.get(vid.to_uint());
-            vb.bindings.push((vid, old_v));
+            let old_v = vb.vals.get(&vid.to_uint());
+            vb.bindings.push((vid, *old_v));
             vb.vals.insert(vid.to_uint(), new_v);
         }
     }

src/librustc/middle/typeck/mod.rs

@@ -69,7 +69,6 @@ use std::list::{List, Nil, Cons};
 use std::list;
 use std::oldmap::HashMap;
 use std::oldmap;
-use std::oldsmallintmap;
 use syntax::ast::{provided, required};
 use syntax::ast_map::node_id_to_str;
 use syntax::ast_util::{local_def, split_trait_methods};