Minor infer/typeck cleanups

Author: lkuper

src/rustc/middle/typeck/check.rs

@@ -73,8 +73,7 @@ import middle::ty::{tv_vid, vid};
 import regionmanip::{replace_bound_regions_in_fn_ty, region_of};
 import rscope::{anon_rscope, binding_rscope, empty_rscope, in_anon_rscope};
 import rscope::{in_binding_rscope, region_scope, type_rscope};
-import syntax::ast::{ty_char, ty_i};
-import typeck::infer::{root, to_str};
+import syntax::ast::ty_i;
 import typeck::infer::{unify_methods}; // infcx.set()
 import typeck::infer::{force_level, force_none, force_non_region_vars_only,
                        force_all};
@@ -624,7 +623,7 @@ fn check_lit(fcx: @fn_ctxt, lit: @ast::lit) -> ty::t {
       ast::lit_str(_) { ty::mk_str(tcx) }
       ast::lit_int(_, t) { ty::mk_mach_int(tcx, t) }
       ast::lit_uint(_, t) { ty::mk_mach_uint(tcx, t) }
-      ast::lit_int_unsuffixed(v) {
+      ast::lit_int_unsuffixed(_) {
         // An unsuffixed integer literal could have any integral type,
         // so we create an integral type variable for it.
         ty::mk_var_integral(tcx, fcx.infcx.next_ty_var_integral_id());

src/rustc/middle/typeck/infer.rs

@@ -209,7 +209,7 @@ fn intersection(a: int_ty_set, b: int_ty_set) -> int_ty_set {
 
 fn single_type_contained_in(tcx: ty::ctxt, a: int_ty_set) ->
     option<ty::t> {
-    #debug["type_contained_in(a=%s)", uint::to_str(*a, 10u)];
+    #debug["single_type_contained_in(a=%s)", uint::to_str(*a, 10u)];
 
     if *a == INT_TY_SET_i8    { ret some(ty::mk_i8(tcx)); }
     if *a == INT_TY_SET_u8    { ret some(ty::mk_u8(tcx)); }
@@ -219,15 +219,11 @@ fn single_type_contained_in(tcx: ty::ctxt, a: int_ty_set) ->
     if *a == INT_TY_SET_u32   { ret some(ty::mk_u32(tcx)); }
     if *a == INT_TY_SET_i64   { ret some(ty::mk_i64(tcx)); }
     if *a == INT_TY_SET_u64   { ret some(ty::mk_u64(tcx)); }
-    if *a == INT_TY_SET_i     { ret(some(ty::mk_int(tcx))); }
-    if *a == INT_TY_SET_u     { ret(some(ty::mk_uint(tcx))); }
+    if *a == INT_TY_SET_i     { ret some(ty::mk_int(tcx)); }
+    if *a == INT_TY_SET_u     { ret some(ty::mk_uint(tcx)); }
     ret none;
 }
 
-fn is_subset_of(a: int_ty_set, b: int_ty_set) -> bool {
-    (*a & *b) == *a
-}
-
 fn convert_integral_ty_to_int_ty_set(tcx: ty::ctxt, t: ty::t)
     -> int_ty_set {
 
@@ -1647,11 +1643,13 @@ fn super_tys<C:combine>(
         self.infcx().vars_integral(self.infcx().tvib, a_id, b_id).then {||
             ok(a) }
       }
-      (ty::ty_var_integral(a_id), _) {
+      (ty::ty_var_integral(a_id), ty::ty_int(_)) |
+      (ty::ty_var_integral(a_id), ty::ty_uint(_)) {
         self.infcx().vart_integral(self.infcx().tvib, a_id, b).then {||
             ok(a) }
       }
-      (_, ty::ty_var_integral(b_id)) {
+      (ty::ty_int(_), ty::ty_var_integral(b_id)) |
+      (ty::ty_uint(_), ty::ty_var_integral(b_id)) {
         self.infcx().tvar_integral(self.infcx().tvib, a, b_id).then {||
             ok(a) }
       }