---

yaml
---
r: 16327
b: refs/heads/try
c: f4fb0f9
h: refs/heads/master
i:
  16325: 8af2066
  16323: 83ac68e
  16319: fe1e7e0
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 3b4cfdeee20eb54d43612fed461729ffa6f6d2ec
+refs/heads/try: f4fb0f9eea00c619c2b91f83072306e89549c260
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

@@ -369,31 +369,23 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
         let t_ctor =
             ty::mk_fn(
                 tcx,
-                ty_of_fn_decl(ccx,
-                                       empty_rscope,
-                                       ast::proto_any,
-                                       ctor.node.dec,
-                                       none));
+                ty_of_fn_decl(ccx, type_rscope(rp), ast::proto_any,
+                              ctor.node.dec, none));
         write_ty_to_tcx(tcx, ctor.node.id, t_ctor);
         tcx.tcache.insert(local_def(ctor.node.id),
                           {bounds: tpt.bounds,
-                           rp: ast::rp_none,
+                           rp: rp,
                            ty: t_ctor});
         option::iter(m_dtor) {|dtor|
             // Write the dtor type
             let t_dtor = ty::mk_fn(
                 tcx,
-                // not sure about empty_rscope
-                // FIXME
-                ty_of_fn_decl(ccx,
-                                       empty_rscope,
-                                       ast::proto_any,
-                                       ast_util::dtor_dec(),
-                                       none));
+                ty_of_fn_decl(ccx, type_rscope(rp), ast::proto_any,
+                              ast_util::dtor_dec(), none));
             write_ty_to_tcx(tcx, dtor.node.id, t_dtor);
             tcx.tcache.insert(local_def(dtor.node.id),
                               {bounds: tpt.bounds,
-                               rp: ast::rp_none,
+                               rp: rp,
                                ty: t_dtor});
         };
         ensure_iface_methods(ccx, it.id);

branches/try/src/test/run-pass/issue-2502.rs

@@ -0,0 +1,13 @@
+class font/& {
+    let fontbuf: &self.[u8];
+
+    new(fontbuf: &self.[u8]) {
+        self.fontbuf = fontbuf;
+    }
+
+    fn buf() -> &self.[u8] {
+        self.fontbuf
+    }
+}
+
+fn main() { }