---

yaml
---
r: 221621
b: refs/heads/master
c: 6b49f4d
h: refs/heads/master
i:
  221619: 9a1b8b7
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1e2677be72e2b0c180ed1be38d1868b4829ad530
+refs/heads/master: 6b49f4ded7c92da2323043bcda59886c881023e9
 refs/heads/snap-stage3: a5c12f4e39d32af3c951b66bd2839bc0b5a1125b
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc_typeck/check/upvar.rs

@@ -183,9 +183,8 @@ impl<'a,'tcx> AdjustBorrowKind<'a,'tcx> {
          * Analysis starting point.
          */
 
-        self.visit_block(body);
+        debug!("analyze_closure(id={:?}, body.id={:?})", id, body.id);
 
-        debug!("analyzing closure `{}` with fn body id `{}`", id, body.id);
 
         let mut euv = euv::ExprUseVisitor::new(self, self.fcx.infcx());
         euv.walk_fn(decl, body);
@@ -485,8 +484,8 @@ impl<'a, 'tcx, 'v> Visitor<'v> for AdjustBorrowKind<'a, 'tcx> {
                 // ignore nested fn items
             }
             visit::FkFnBlock => {
-                self.analyze_closure(id, decl, body);
                 visit::walk_fn(self, fn_kind, decl, body, span);
+                self.analyze_closure(id, span, decl, body);
             }
         }
     }