---

yaml
---
r: 29758
b: refs/heads/incoming
c: 0e0833e
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 5fd891f10b18832770d9c5253cf0c22d9744b17a
+refs/heads/incoming: 0e0833e0b038ea3015a2036e0c9431f6c60db82f
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/base.rs

@@ -699,9 +699,9 @@ fn make_visit_glue(bcx: block, v: ValueRef, t: ty::t) {
     let _icx = bcx.insn_ctxt(~"make_visit_glue");
     let mut bcx = bcx;
     assert bcx.ccx().tcx.intrinsic_defs.contains_key(@~"ty_visitor");
-    let (iid, ty) = bcx.ccx().tcx.intrinsic_defs.get(@~"ty_visitor");
+    let (trait_id, ty) = bcx.ccx().tcx.intrinsic_defs.get(@~"ty_visitor");
     let v = PointerCast(bcx, v, T_ptr(type_of::type_of(bcx.ccx(), ty)));
-    bcx = reflect::emit_calls_to_trait_visit_ty(bcx, t, v, iid);
+    bcx = reflect::emit_calls_to_trait_visit_ty(bcx, t, v, trait_id);
     build_return(bcx);
 }
 

branches/incoming/src/rustc/middle/trans/impl.rs

@@ -66,13 +66,13 @@ fn trans_method_callee(bcx: block, callee_id: ast::node_id,
         {env: self_env(val, node_id_type(bcx, self.id), none)
          with lval_static_fn(bcx, did, callee_id)}
       }
-      typeck::method_param({trait_id:iid, method_num:off,
+      typeck::method_param({trait_id:trait_id, method_num:off,
                             param_num:p, bound_num:b}) => {
         match check bcx.fcx.param_substs {
           some(substs) => {
             let vtbl = find_vtable_in_fn_ctxt(substs, p, b);
             trans_monomorphized_callee(bcx, callee_id, self, mentry.derefs,
-                                       iid, off, vtbl)
+                                       trait_id, off, vtbl)
           }
         }
       }
@@ -195,7 +195,7 @@ fn trans_monomorphized_callee(bcx: block, callee_id: ast::node_id,
              ccx, node_id_type(bcx, callee_id))))
          with lval}
       }
-      typeck::vtable_trait(iid, tps) => {
+      typeck::vtable_trait(trait_id, tps) => {
         let {bcx, val} = trans_temp_expr(bcx, base);
         let fty = node_id_type(bcx, callee_id);
         trans_trait_callee(bcx, val, fty, n_method)
@@ -250,14 +250,15 @@ fn resolve_vtables_in_fn_ctxt(fcx: fn_ctxt, vts: typeck::vtable_res)
 fn resolve_vtable_in_fn_ctxt(fcx: fn_ctxt, vt: typeck::vtable_origin)
     -> typeck::vtable_origin {
     match vt {
-      typeck::vtable_static(iid, tys, sub) => {
+      typeck::vtable_static(trait_id, tys, sub) => {
         let tys = match fcx.param_substs {
           some(substs) => {
             vec::map(tys, |t| ty::subst_tps(fcx.ccx.tcx, substs.tys, t))
           }
           _ => tys
         };
-        typeck::vtable_static(iid, tys, resolve_vtables_in_fn_ctxt(fcx, sub))
+        typeck::vtable_static(trait_id, tys,
+                              resolve_vtables_in_fn_ctxt(fcx, sub))
       }
       typeck::vtable_param(n_param, n_bound) => {
         match check fcx.param_substs {

branches/incoming/src/rustc/middle/trans/reflect.rs

@@ -288,15 +288,15 @@ impl reflector {
 // Emit a sequence of calls to visit_ty::visit_foo
 fn emit_calls_to_trait_visit_ty(bcx: block, t: ty::t,
                                 visitor_val: ValueRef,
-                                visitor_iid: def_id) -> block {
+                                visitor_trait_id: def_id) -> block {
 
     let final = sub_block(bcx, ~"final");
     assert bcx.ccx().tcx.intrinsic_defs.contains_key(@~"tydesc");
     let (_, tydesc_ty) = bcx.ccx().tcx.intrinsic_defs.get(@~"tydesc");
     let tydesc_ty = type_of::type_of(bcx.ccx(), tydesc_ty);
     let r = reflector({
         visitor_val: visitor_val,
-        visitor_methods: ty::trait_methods(bcx.tcx(), visitor_iid),
+        visitor_methods: ty::trait_methods(bcx.tcx(), visitor_trait_id),
         final_bcx: final,
         tydesc_ty: tydesc_ty,
         mut bcx: bcx

branches/incoming/src/rustc/middle/typeck/check/method.rs

@@ -229,7 +229,7 @@ class lookup {
         let mut trait_bnd_idx = 0u; // count only trait bounds
         let bounds = tcx.ty_param_bounds.get(did.node);
         for vec::each(*bounds) |bound| {
-            let (iid, bound_substs) = match bound {
+            let (trait_id, bound_substs) = match bound {
               ty::bound_copy | ty::bound_send | ty::bound_const |
               ty::bound_owned => {
                 again; /* ok */
@@ -241,7 +241,7 @@ class lookup {
               }
             };
 
-            let trt_methods = ty::trait_methods(tcx, iid);
+            let trt_methods = ty::trait_methods(tcx, trait_id);
             match vec::position(*trt_methods, |m| m.ident == self.m_name) {
               none => {
                 /* check next bound */
@@ -261,7 +261,7 @@ class lookup {
 
                 self.add_candidates_from_m(
                     substs, trt_methods[pos],
-                    method_param({trait_id:iid,
+                    method_param({trait_id:trait_id,
                                   method_num:pos,
                                   param_num:n,
                                   bound_num:trait_bnd_idx}));