---

yaml
---
r: 15175
b: refs/heads/try
c: 3c398d2
h: refs/heads/master
i:
  15173: 7354e4a
  15171: 2f445e4
  15167: d234810
v: v3

Author: pcwalton

[refs]

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

branches/try/src/rustc/middle/infer.rs

@@ -834,7 +834,7 @@ impl resolve_methods for infer_ctxt {
               }
               _ { region }
             }
-        }), typ);
+        }, false), typ);
 
         let ur = *unresolved;
         alt ur {

branches/try/src/rustc/middle/ty.rs

@@ -610,7 +610,8 @@ fn maybe_walk_ty(ty: t, f: fn(t) -> bool) {
 enum fold_mode {
     fm_var(fn@(int) -> t),
     fm_param(fn@(uint, def_id) -> t),
-    fm_rptr(fn@(region, bool /* under & */) -> region),
+    fm_rptr(fn@(region, bool /* under & */) -> region,
+            bool /* descend into outermost fn */),
     fm_general(fn@(t) -> t),
 }
 
@@ -622,7 +623,7 @@ fn fold_ty(cx: ctxt, fld: fold_mode, ty_0: t) -> t {
         alt fld {
           fm_var(_) { if !tb.has_vars { ret ty; } }
           fm_param(_) { if !tb.has_params { ret ty; } }
-          fm_rptr(_) { if !tb.has_rptrs { ret ty; } }
+          fm_rptr(_,_) { if !tb.has_rptrs { ret ty; } }
           fm_general(_) {/* no fast path */ }
         }
 
@@ -678,22 +679,27 @@ fn fold_ty(cx: ctxt, fld: fold_mode, ty_0: t) -> t {
             ty = mk_tup(cx, new_ts);
           }
           ty_fn(f) {
+            let mut new_fld;
             alt fld {
-              fm_rptr(_) {
+              fm_rptr(_, false) {
                 // Don't recurse into functions, because regions are
                 // universally quantified, well, universally, at function
                 // boundaries.
+                ret ty;
               }
-              _ {
-                let mut new_args: [arg] = [];
-                for a: arg in f.inputs {
-                    let new_ty = do_fold(cx, fld, a.ty, under_rptr);
-                    new_args += [{mode: a.mode, ty: new_ty}];
-                }
-                let new_output = do_fold(cx, fld, f.output, under_rptr);
-                ty = mk_fn(cx, {inputs: new_args, output: new_output with f});
+              fm_rptr(f, true) {
+                new_fld = fm_rptr(f, false);
               }
+              _ { new_fld = fld; }
+            }
+
+            let mut new_args: [arg] = [];
+            for a: arg in f.inputs {
+                let new_ty = do_fold(cx, new_fld, a.ty, under_rptr);
+                new_args += [{mode: a.mode, ty: new_ty}];
             }
+            let new_output = do_fold(cx, new_fld, f.output, under_rptr);
+            ty = mk_fn(cx, {inputs: new_args, output: new_output with f});
           }
           ty_res(did, subty, tps) {
             let mut new_tps = [];
@@ -711,7 +717,7 @@ fn fold_ty(cx: ctxt, fld: fold_mode, ty_0: t) -> t {
           }
           ty_rptr(r, tm) {
             let region = alt fld {
-                fm_rptr(folder) { folder(r, under_rptr) }
+                fm_rptr(folder, _) { folder(r, under_rptr) }
                 _ { r }
             };
             ty = mk_rptr(cx, region,