---

yaml
---
r: 41600
b: refs/heads/master
c: 7b433d0
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0e774de7661df81cf0e5537ef581823fc148fc2a
+refs/heads/master: 7b433d098a4a6b9959976633a77041923cef38c3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/typeck/check/mod.rs

@@ -178,10 +178,7 @@ pub struct fn_ctxt {
     // var_bindings, locals and next_var_id are shared
     // with any nested functions that capture the environment
     // (and with any functions whose environment is being captured).
-
-    // Refers to whichever `self` is in scope, even this fn_ctxt is
-    // for a nested closure that captures `self`
-    self_info: Option<self_info>,
+    self_impl_def_id: Option<ast::def_id>,
     ret_ty: ty::t,
     // Used by loop bodies that return from the outer function
     indirect_ret_ty: Option<ty::t>,
@@ -230,7 +227,7 @@ fn blank_fn_ctxt(ccx: @crate_ctxt, rty: ty::t,
 // It's kind of a kludge to manufacture a fake function context
 // and statement context, but we might as well do write the code only once
     @fn_ctxt {
-        self_info: None,
+        self_impl_def_id: None,
         ret_ty: rty,
         indirect_ret_ty: None,
         purity: ast::pure_fn,
@@ -323,7 +320,7 @@ fn check_fn(ccx: @crate_ctxt,
         } else { None };
 
         @fn_ctxt {
-            self_info: self_info,
+            self_impl_def_id: self_info.map(|self_info| self_info.def_id),
             ret_ty: ret_ty,
             indirect_ret_ty: indirect_ret_ty,
             purity: purity,
@@ -1556,9 +1553,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
 
         fcx.write_ty(expr.id, fty);
 
-        // We inherit the same self info as the enclosing scope,
-        // since the function we're checking might capture `self`
-        check_fn(fcx.ccx, fcx.self_info, &fn_ty, decl, body,
+        check_fn(fcx.ccx, None, &fn_ty, decl, body,
                  fn_kind, Some(fcx));
     }
 

trunk/src/librustc/middle/typeck/infer/mod.rs

@@ -737,16 +737,15 @@ impl infer_ctxt {
     fn type_error_message(sp: span, mk_msg: fn(~str) -> ~str,
                           actual_ty: ty::t, err: Option<&ty::type_err>) {
         let actual_ty = self.resolve_type_vars_if_possible(actual_ty);
-        let mut actual_sty = ty::get(copy actual_ty);
 
         // Don't report an error if actual type is ty_err.
-        match actual_sty.sty {
+        match ty::get(actual_ty).sty {
             ty::ty_err => return,
             // Should really not report an error if the type
             // has ty_err anywhere as a component, but that's
             // annoying since we haven't written a visitor for
             // ty::t yet
-            ty::ty_fn(ref fty) => match ty::get(fty.sig.output).sty {
+            ty::ty_fn(fty) => match ty::get(fty.sig.output).sty {
                 ty::ty_err => return,
                 _ => ()
             },

trunk/src/test/run-pass/issue-3563-2.rs

@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test
 trait A {
   fn a(&self) {
-      || self.b() //~ ERROR type `&self/self` does not implement any method in scope named `b`
+    || self.b()
   }
 }
-fn main() {}