---

yaml
---
r: 31469
b: refs/heads/dist-snap
c: 6384917
h: refs/heads/master
i:
  31467: 0bc8217
v: v3

Author: nikomatsakis

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 2407373fa494c9043eba633675c4a2a89769d1b2
+refs/heads/dist-snap: 638491712e265c8d5bc9bd9852ece17b5ec78f5b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/region.rs

@@ -485,7 +485,16 @@ fn determine_rp_in_ty(ty: @ast::ty,
       _ {}
     }
 
-    visit::visit_ty(ty, cx, visitor);
+    alt ty.node {
+      ast::ty_fn(*) => {
+        do cx.with(cx.item_id, false) {
+            visit::visit_ty(ty, cx, visitor);
+        }
+      }
+      _ => {
+        visit::visit_ty(ty, cx, visitor);
+      }
+    }
 }
 
 fn determine_rp_in_crate(sess: session,

branches/dist-snap/src/test/compile-fail/regions-infer-region-in-fn-but-not-type.rs

@@ -0,0 +1,9 @@
+
+// check that the &int here does not cause us to think that `foo`
+// contains region pointers
+enum foo = fn~(x: &int);
+
+fn take_foo(x: foo/&) {} //~ ERROR no region bound is allowed on `foo`
+
+fn main() {
+}