---

yaml
---
r: 147553
b: refs/heads/try2
c: ec02f94
h: refs/heads/master
i:
  147551: 10f90f9
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: 01d8380b19f63f1a8acafcc340c7e964b55fda82
+refs/heads/try2: ec02f9457cfbd336296951bad66dcb621c865166
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -450,7 +450,7 @@ struct Module {
     glob_count: Cell<uint>,
 
     // The index of the import we're resolving.
-    resolved_import_count: uint,
+    resolved_import_count: Cell<uint>,
 
     // Whether this module is populated. If not populated, any attempt to
     // access the children must be preceded with a
@@ -476,14 +476,14 @@ impl Module {
             anonymous_children: @mut HashMap::new(),
             import_resolutions: @mut HashMap::new(),
             glob_count: Cell::new(0),
-            resolved_import_count: 0,
+            resolved_import_count: Cell::new(0),
             populated: Cell::new(!external),
         }
     }
 
     fn all_imports_resolved(&self) -> bool {
         let imports = &mut *self.imports;
-        return imports.len() == self.resolved_import_count;
+        return imports.len() == self.resolved_import_count.get();
     }
 }
 
@@ -2039,8 +2039,8 @@ impl Resolver {
 
         let imports = &mut *module.imports;
         let import_count = imports.len();
-        while module.resolved_import_count < import_count {
-            let import_index = module.resolved_import_count;
+        while module.resolved_import_count.get() < import_count {
+            let import_index = module.resolved_import_count.get();
             let import_directive = imports[import_index];
             match self.resolve_import_for_module(module, import_directive) {
                 Failed => {
@@ -2060,7 +2060,8 @@ impl Resolver {
                 }
             }
 
-            module.resolved_import_count += 1;
+            module.resolved_import_count
+                  .set(module.resolved_import_count.get() + 1);
         }
     }
 
@@ -3151,7 +3152,7 @@ impl Resolver {
     }
 
     fn report_unresolved_imports(&mut self, module_: @mut Module) {
-        let index = module_.resolved_import_count;
+        let index = module_.resolved_import_count.get();
         let imports: &mut ~[@ImportDirective] = &mut *module_.imports;
         let import_count = imports.len();
         if index != import_count {