---

yaml
---
r: 11819
b: refs/heads/master
c: b87cdd8
h: refs/heads/master
i:
  11817: a61fcd8
  11815: 01a6976
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5c23d21e83606611988e5b218d48e2ed0549a6d3
+refs/heads/master: b87cdd857228e576d0fcccba0d92b0b231375923
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/region.rs

@@ -244,8 +244,8 @@ fn resolve_expr(expr: @ast::expr, cx: ctxt, visitor: visit::vt<ctxt>) {
 fn resolve_item(item: @ast::item, cx: ctxt, visitor: visit::vt<ctxt>) {
     // Items create a new outer block scope as far as we're concerned.
     let parent = alt item.node {
-        ast::item_fn(_, _, _)   { pa_fn_item(item.id) }
-        _                       { pa_item(item.id)    }
+        ast::item_fn(_, _, _) | ast::item_enum(_, _) { pa_fn_item(item.id) }
+        _ { pa_item(item.id) }
     };
     let new_cx: ctxt = {bindings: @list::nil,
                         parent: parent,

trunk/src/rustc/middle/ty.rs

@@ -1925,6 +1925,10 @@ mod unify {
             }
         }
 
+        if sub == ty::re_inferred || super == ty::re_inferred {
+            ret if sub == super { some(super) } else { none };
+        }
+
         // Outer regions are subtypes of inner regions. (This is somewhat
         // surprising!)
         let superscope = region::region_to_scope(cx.tcx.region_map, super);