---

yaml
---
r: 233533
b: refs/heads/beta
c: ff6dd5c
h: refs/heads/master
i:
  233531: bc0db4a
v: v3

Author: GSam

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: f4ea3928aca448788e0d3abc05d7ece832278f80
+refs/heads/beta: ff6dd5c24b0da35d5ad1e0e20082f3d62b74b190
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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");