---

yaml
---
r: 30031
b: refs/heads/incoming
c: 5eea7d6
h: refs/heads/master
i:
  30029: 28b3705
  30027: fa97fed
  30023: 9c8cd4f
  30015: cbf6e98
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: 89222646f446e608f151c08f6623c695d7b8c673
+refs/heads/incoming: 5eea7d6e618ff1f4a26ab79b2fb53208b0ce7912
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -518,6 +518,21 @@ impl determine_rp_ctxt {
         }
     }
 
+    // For named types like Foo, if there is no explicit region
+    // parameter, then we will add the anonymous region, so there is
+    // a dependency if the anonymous region implies rp.
+    //
+    // If the region is explicitly specified, then we follows the
+    // normal rules.
+    fn opt_region_is_relevant(opt_r: option<@ast::region>) -> bool {
+        debug!("opt_region_is_relevant: %? (anon_implies_rp=%b)",
+               opt_r, self.anon_implies_rp);
+        match opt_r {
+          none => self.anon_implies_rp,
+          some(r) => self.region_is_relevant(r)
+        }
+    }
+
     fn with(item_id: ast::node_id,
             anon_implies_rp: bool,
             f: fn()) {
@@ -613,19 +628,23 @@ fn determine_rp_in_ty(ty: @ast::ty,
     // then check whether it is region-parameterized and consider
     // that as a direct dependency.
     match ty.node {
-      ast::ty_path(_, id) => {
+      ast::ty_path(path, id) => {
         match cx.def_map.get(id) {
           ast::def_ty(did) | ast::def_class(did, _) => {
             if did.crate == ast::local_crate {
-                cx.add_dep(did.node);
+                if cx.opt_region_is_relevant(path.rp) {
+                    cx.add_dep(did.node);
+                }
             } else {
                 let cstore = cx.sess.cstore;
                 match csearch::get_region_param(cstore, did) {
                   none => {}
                   some(variance) => {
                     debug!("reference to external, rp'd type %s",
                            pprust::ty_to_str(ty, cx.sess.intr()));
-                    cx.add_rp(cx.item_id, cx.add_variance(variance))
+                    if cx.opt_region_is_relevant(path.rp) {
+                        cx.add_rp(cx.item_id, cx.add_variance(variance))
+                    }
                   }
                 }
             }

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

@@ -0,0 +1,21 @@
+struct direct {
+    f: ∫
+}
+
+struct indirect1 {
+    g: fn@(direct);
+}
+
+struct indirect2 {
+    g: fn@(direct/&);
+}
+
+struct indirect3 {
+    g: fn@(direct/&self);
+}
+
+fn take_direct(p: direct) -> direct { p } //~ ERROR mismatched types
+fn take_indirect1(p: indirect1) -> indirect1 { p }
+fn take_indirect2(p: indirect2) -> indirect2 { p }
+fn take_indirect3(p: indirect3) -> indirect3 { p } //~ ERROR mismatched types
+fn main() {}