---

yaml
---
r: 147552
b: refs/heads/try2
c: 01d8380
h: refs/heads/master
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: 6db9a8c55cc45afb5b28f67352f32507188094f5
+refs/heads/try2: 01d8380b19f63f1a8acafcc340c7e964b55fda82
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -447,7 +447,7 @@ struct Module {
     import_resolutions: @mut HashMap<Name, @mut ImportResolution>,
 
     // The number of unresolved globs that this module exports.
-    glob_count: uint,
+    glob_count: Cell<uint>,
 
     // The index of the import we're resolving.
     resolved_import_count: uint,
@@ -475,7 +475,7 @@ impl Module {
             external_module_children: @mut HashMap::new(),
             anonymous_children: @mut HashMap::new(),
             import_resolutions: @mut HashMap::new(),
-            glob_count: 0,
+            glob_count: Cell::new(0),
             resolved_import_count: 0,
             populated: Cell::new(!external),
         }
@@ -1961,7 +1961,7 @@ impl Resolver {
                 // Set the glob flag. This tells us that we don't know the
                 // module's exports ahead of time.
 
-                module_.glob_count += 1;
+                module_.glob_count.set(module_.glob_count.get() + 1);
             }
         }
 
@@ -2192,8 +2192,8 @@ impl Resolver {
         if !resolution_result.indeterminate() {
             match *import_directive.subclass {
                 GlobImport => {
-                    assert!(module_.glob_count >= 1);
-                    module_.glob_count -= 1;
+                    assert!(module_.glob_count.get() >= 1);
+                    module_.glob_count.set(module_.glob_count.get() - 1);
                 }
                 SingleImport(..) => {
                     // Ignore.
@@ -2268,7 +2268,7 @@ impl Resolver {
                 // containing module, bail out. We don't know enough to be
                 // able to resolve this import.
 
-                if containing_module.glob_count > 0 {
+                if containing_module.glob_count.get() > 0 {
                     debug!("(resolving single import) unresolved glob; \
                             bailing out");
                     return Indeterminate;
@@ -2463,7 +2463,7 @@ impl Resolver {
             return Indeterminate;
         }
 
-        assert_eq!(containing_module.glob_count, 0);
+        assert_eq!(containing_module.glob_count.get(), 0);
 
         // Add all resolved imports from the containing module.
         for (ident, target_import_resolution) in containing_module.import_resolutions.iter() {
@@ -3102,7 +3102,7 @@ impl Resolver {
         // If this is a search of all imports, we should be done with glob
         // resolution at this point.
         if name_search_type == PathSearch {
-            assert_eq!(module_.glob_count, 0);
+            assert_eq!(module_.glob_count.get(), 0);
         }
 
         // Check the list of resolved imports.