---

yaml
---
r: 227113
b: refs/heads/master
c: ff6dd5c
h: refs/heads/master
i:
  227111: 5cabc80
v: v3

Author: GSam

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f4ea3928aca448788e0d3abc05d7ece832278f80
+refs/heads/master: ff6dd5c24b0da35d5ad1e0e20082f3d62b74b190
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc_resolve/lib.rs

@@ -2624,9 +2624,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
         visit::walk_block(self, block);
 
         // Move back up.
-        self.current_module = orig_module;
-
         if !self.resolved {
+            self.current_module = orig_module;
             self.value_ribs.pop();
         }
         debug!("(resolving block) leaving block");