---

yaml
---
r: 40283
b: refs/heads/dist-snap
c: b90d7d4
h: refs/heads/master
i:
  40281: 604715f
  40279: be03313
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 9e0c59614143abae80b155ca835758e27f286d14
+refs/heads/dist-snap: b90d7d4c817743234f33695837b2e0aa7bf01d3a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/rustc/middle/typeck/check.rs

@@ -78,7 +78,7 @@ use typeck::infer::{resolve_type, force_tvar};
 use result::{Result, Ok, Err};
 use syntax::print::pprust;
 use syntax::parse::token::special_idents;
-use vtable::LocationInfo;
+use vtable::{LocationInfo, VtableContext};
 
 use std::map::HashMap;
 
@@ -865,20 +865,20 @@ fn check_expr(fcx: @fn_ctxt, expr: @ast::expr,
 // declared on the impl declaration e.g., `impl<A,B> for ~[(A,B)]`
 // would return ($0, $1) where $0 and $1 are freshly instantiated type
 // variables.
-fn impl_self_ty(fcx: @fn_ctxt,
+fn impl_self_ty(vcx: &VtableContext,
                 location_info: &LocationInfo, // (potential) receiver for
                                               // this impl
                 did: ast::def_id) -> ty_param_substs_and_ty {
-    let tcx = fcx.ccx.tcx;
+    let tcx = vcx.tcx();
 
     let {n_tps, region_param, raw_ty} = if did.crate == ast::local_crate {
-        let region_param = fcx.tcx().region_paramd_items.find(did.node);
+        let region_param = tcx.region_paramd_items.find(did.node);
         match tcx.items.find(did.node) {
           Some(ast_map::node_item(@{node: ast::item_impl(ts, _, st, _),
                                   _}, _)) => {
             {n_tps: ts.len(),
              region_param: region_param,
-             raw_ty: fcx.ccx.to_ty(rscope::type_rscope(region_param), st)}
+             raw_ty: vcx.ccx.to_ty(rscope::type_rscope(region_param), st)}
           }
           Some(ast_map::node_item(@{node: ast::item_class(_, ts),
                                     id: class_id, _},_)) => {
@@ -904,12 +904,12 @@ fn impl_self_ty(fcx: @fn_ctxt,
     };
 
     let self_r = if region_param.is_some() {
-        Some(fcx.infcx().next_region_var(location_info.span,
+        Some(vcx.infcx.next_region_var(location_info.span,
                                          location_info.id))
     } else {
         None
     };
-    let tps = fcx.infcx().next_ty_vars(n_tps);
+    let tps = vcx.infcx.next_ty_vars(n_tps);
 
     let substs = {self_r: self_r, self_ty: None, tps: tps};
     let substd_ty = ty::subst(tcx, &substs, raw_ty);

branches/dist-snap/src/rustc/middle/typeck/check/method.rs

@@ -492,8 +492,12 @@ impl LookupContext {
         // determine the `self` of the impl with fresh
         // variables for each parameter:
         let location_info = &vtable::location_info_for_expr(self.self_expr);
+        let vcx = VtableContext {
+            ccx: self.fcx.ccx,
+            infcx: self.fcx.infcx()
+        };
         let {substs: impl_substs, ty: impl_ty} =
-            impl_self_ty(self.fcx, location_info, impl_info.did);
+            impl_self_ty(&vcx, location_info, impl_info.did);
 
         let (impl_ty, impl_substs) =
             self.create_rcvr_ty_and_substs_for_method(