---

yaml
---
r: 30036
b: refs/heads/incoming
c: 5ccf817
h: refs/heads/master
v: v3

Author: nikomatsakis

[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: feca839b9bd1ca8f8dac2533e6d87c62b1c1a02d
+refs/heads/incoming: 5ccf8175a8ae5f6aaff30bb2330a5f05ec89028d
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/region.rs

@@ -655,6 +655,25 @@ fn determine_rp_in_ty(ty: @ast::ty,
       _ => {}
     }
 
+    // temporary hack: right now, fn() is short for &fn(), but @(fn())
+    // is `@fn()`, so catch this and set anon_implies_rp to none in
+    // that case
+    match ty.node {
+      ast::ty_box(mt) | ast::ty_uniq(mt) => {
+        match mt.ty.node {
+          ast::ty_fn(ast::proto_bare, _, _) |
+          ast::ty_fn(ast::proto_block, _, _) => {
+            do cx.with(cx.item_id, false) {
+                visit_mt(mt, cx, visitor);
+            }
+            return;
+          }
+          _ => {}
+        }
+      }
+      _ => {}
+    }
+
     match ty.node {
       ast::ty_box(mt) | ast::ty_uniq(mt) | ast::ty_vec(mt) |
       ast::ty_rptr(_, mt) | ast::ty_ptr(mt) => {

branches/incoming/src/test/compile-fail/regions-infer-at-fn-not-param.rs

@@ -0,0 +1,22 @@
+struct param1 {
+    g: &fn();
+}
+
+struct param2 {
+    g: fn();
+}
+
+struct not_param1 {
+    g: @fn();
+}
+
+struct not_param2 {
+    g: @fn();
+}
+
+fn take1(p: param1) -> param1 { p } //~ ERROR mismatched types
+fn take2(p: param2) -> param2 { p } //~ ERROR mismatched types
+fn take3(p: not_param1) -> not_param1 { p }
+fn take4(p: not_param2) -> not_param2 { p }
+
+fn main() {}