auto merge of #13244 : cmr/rust/tbaa, r=alexcrichton

diff --cc src/librustc/middle/ty.rs
index 176ed409dd49f6bfb8082600277f542c3c2b7f81,1a12c0ab6ac0afd56dbcc398953be9c0e31ed76f..f9296926c748a22128e63c4296658fca631bb435
--- 1/src/librustc/middle/ty.rs
--- 2/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@@ -4365,16 -4181,9 +4188,9 @@@ pub fn is_binopable(cx: &ctxt, ty: t, o
      /*bot*/     [t, t, t, t,     t,   t,  t,   t],
      /*raw ptr*/ [f, f, f, f,     t,   t,  f,   f]];
  
 -    return tbl[tycat(cx, ty)][opcat(op)];
 +    return tbl[tycat(cx, ty) as uint ][opcat(op) as uint];
  }
  
- pub fn ty_params_to_tys(tcx: &ctxt, generics: &ast::Generics) -> Vec<t> {
-     Vec::from_fn(generics.ty_params.len(), |i| {
-         let id = generics.ty_params.get(i).id;
-         ty::mk_param(tcx, i, ast_util::local_def(id))
-     })
- }
- 
  /// Returns an equivalent type with all the typedefs and self regions removed.
  pub fn normalize_ty(cx: &ctxt, t: t) -> t {
      let u = TypeNormalizer(cx).fold_ty(t);

diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge