std: Camel case smallintmap

3 files changed, 6 insertions, 5 deletions

diff --git a/src/rustc/middle/lint.rs b/src/rustc/middle/lint.rs
index 349e308255a..df7fe24b0c2 100644
--- a/src/rustc/middle/lint.rs
+++ b/src/rustc/middle/lint.rs
@@ -5,7 +5,7 @@ use syntax::{ast, ast_util, visit};
 use syntax::attr;
 use syntax::codemap::span;
 use std::map::{map,hashmap,int_hash,hash_from_strs};
-use std::smallintmap::{map,smallintmap};
+use std::smallintmap::{map,SmallIntMap};
 use io::WriterUtil;
 use util::ppaux::{ty_to_str};
 use middle::pat_util::{pat_bindings};
@@ -187,7 +187,7 @@ fn get_lint_dict() -> lint_dict {
 }
 
 // This is a highly not-optimal set of data structure decisions.
-type lint_modes = smallintmap<level>;
+type lint_modes = SmallIntMap<level>;
 type lint_mode_map = hashmap<ast::node_id, lint_modes>;
 
 // settings_map maps node ids of items with non-default lint settings
@@ -223,7 +223,7 @@ fn get_lint_settings_level(settings: lint_settings,
 // This is kind of unfortunate. It should be somewhere else, or we should use
 // a persistent data structure...
 fn clone_lint_modes(modes: lint_modes) -> lint_modes {
-    std::smallintmap::smallintmap_(@{v: copy modes.v})
+    std::smallintmap::SmallIntMap_(@{v: copy modes.v})
 }
 
 type ctxt_ = {dict: lint_dict,
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index e0d8f969c05..5debbf6b006 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -640,7 +640,7 @@ type type_cache = hashmap<ast::def_id, ty_param_bounds_and_ty>;
 
 type constness_cache = hashmap<ast::def_id, const_eval::constness>;
 
-type node_type_table = @smallintmap::smallintmap<t>;
+type node_type_table = @smallintmap::SmallIntMap<t>;
 
 fn mk_rcache() -> creader_cache {
     type val = {cnum: int, pos: uint, len: uint};
diff --git a/src/rustc/middle/typeck/infer/unify.rs b/src/rustc/middle/typeck/infer/unify.rs
index 690c6d8d8d0..f5c0892219f 100644
--- a/src/rustc/middle/typeck/infer/unify.rs
+++ b/src/rustc/middle/typeck/infer/unify.rs
@@ -1,6 +1,7 @@
 use combine::combine;
 use integral::*;
 use to_str::to_str;
+use std::smallintmap::SmallIntMap;
 
 enum var_value<V:copy, T:copy> {
     redirect(V),
@@ -8,7 +9,7 @@ enum var_value<V:copy, T:copy> {
 }
 
 struct vals_and_bindings<V:copy, T:copy> {
-    vals: smallintmap<var_value<V, T>>;
+    vals: SmallIntMap<var_value<V, T>>;
     mut bindings: ~[(V, var_value<V, T>)];
 }