---

yaml
---
r: 147627
b: refs/heads/try2
c: abe2ad0
h: refs/heads/master
i:
  147625: b773132
  147623: 6e875e8
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9988970e81ab877f8cba0bf0d0cc6df7aed52fb7
+refs/heads/try2: abe2ad0ff86639a100c164d020a474e232c97318
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/resolve.rs

@@ -439,7 +439,7 @@ struct Module {
     //
     // There will be an anonymous module created around `g` with the ID of the
     // entry block for `f`.
-    anonymous_children: @mut HashMap<NodeId,@Module>,
+    anonymous_children: RefCell<HashMap<NodeId,@Module>>,
 
     // The status of resolving each import in this module.
     import_resolutions: @mut HashMap<Name, @mut ImportResolution>,
@@ -471,7 +471,7 @@ impl Module {
             children: @mut HashMap::new(),
             imports: @mut ~[],
             external_module_children: RefCell::new(HashMap::new()),
-            anonymous_children: @mut HashMap::new(),
+            anonymous_children: RefCell::new(HashMap::new()),
             import_resolutions: @mut HashMap::new(),
             glob_count: Cell::new(0),
             resolved_import_count: Cell::new(0),
@@ -1579,8 +1579,12 @@ impl Resolver {
                 AnonymousModuleKind,
                 false,
                 false);
-            parent_module.anonymous_children.insert(block_id, new_module);
-            ModuleReducedGraphParent(new_module)
+            {
+                let mut anonymous_children = parent_module.anonymous_children
+                                                          .borrow_mut();
+                anonymous_children.get().insert(block_id, new_module);
+                ModuleReducedGraphParent(new_module)
+            }
         } else {
             parent
         }
@@ -2031,7 +2035,8 @@ impl Resolver {
             }
         }
 
-        for (_, &child_module) in module_.anonymous_children.iter() {
+        let anonymous_children = module_.anonymous_children.borrow();
+        for (_, &child_module) in anonymous_children.get().iter() {
             self.resolve_imports_for_module_subtree(child_module);
         }
     }
@@ -3201,7 +3206,8 @@ impl Resolver {
             }
         }
 
-        for (_, &module_) in module_.anonymous_children.iter() {
+        let anonymous_children = module_.anonymous_children.borrow();
+        for (_, &module_) in anonymous_children.get().iter() {
             self.report_unresolved_imports(module_);
         }
     }
@@ -3261,7 +3267,8 @@ impl Resolver {
             }
         }
 
-        for (_, &child_module) in module_.anonymous_children.iter() {
+        let anonymous_children = module_.anonymous_children.borrow();
+        for (_, &child_module) in anonymous_children.get().iter() {
             self.record_exports_for_module_subtree(child_module);
         }
     }
@@ -4142,7 +4149,10 @@ impl Resolver {
 
         // Move down in the graph, if there's an anonymous module rooted here.
         let orig_module = self.current_module;
-        match self.current_module.anonymous_children.find(&block.id) {
+        let anonymous_children = self.current_module
+                                     .anonymous_children
+                                     .borrow();
+        match anonymous_children.get().find(&block.id) {
             None => { /* Nothing to do. */ }
             Some(&anonymous_module) => {
                 debug!("(resolving block) found anonymous module, moving \