---

yaml
---
r: 15616
b: refs/heads/try
c: 71128e7
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 7113a2c30b4ba5e7105879f6b5d683813eebc722
+refs/heads/try: 71128e75b083c9e5915d4fe1aa99f3abeee8f043
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/typeck.rs

@@ -2646,13 +2646,13 @@ impl methods for lookup {
                           tps: self_substs.tps + m_substs};
         self.fcx.write_ty_substs(self.node_id, fty, all_substs);
 
-        // FIXME--this treatment of self and regions seems wrong.  As a rule
-        // of thumb, one ought to substitute all type parameters at once, and
-        // we are not doing so here.  The danger you open up has to do with
-        // the possibility that one of the substs in `all_substs` maps to a
-        // self type.  Right now I think this is impossible but it may not be
-        // forever, and it's just sloppy to substitute in multiple steps.
-        // Probably the self parameter ought to be part of the all_substs.
+        // n.b. This treatment of self is risky but ok.  As a rule of thumb,
+        // one ought to substitute all type parameters at once, and we are not
+        // doing so here.  The danger you open up has to do with the
+        // possibility that one of the substs in `all_substs` maps to a self
+        // type.  However, right now I think it is safe because the types in
+        // `all_substs` may not refer to self.  This may not stay true
+        // forever, though.
 
         if has_self && !option::is_none(self_ty_sub) {
             let fty = self.fcx.node_ty(self.node_id);
@@ -2662,13 +2662,6 @@ impl methods for lookup {
             self.fcx.write_ty(self.node_id, fty);
         }
 
-        if ty::type_has_regions(ty::ty_fn_ret(fty)) {
-            let fty = self.fcx.node_ty(self.node_id);
-            let self_region = region_of(self.fcx, self.expr);
-            let fty = replace_self_region(self.tcx(), self_region, fty);
-            self.fcx.write_ty(self.node_id, fty);
-        }
-
         ret origin;
     }
 }