---

yaml
---
r: 147651
b: refs/heads/try2
c: de6eb2b
h: refs/heads/master
i:
  147649: eef0cf4
  147647: 3c2659e
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: ccb18f47e25daee22f151f3d21774eec38abdbe3
+refs/heads/try2: de6eb2b2906cb959ce374306c28c535c5e799982
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -351,7 +351,7 @@ struct ImportResolution {
     // The number of outstanding references to this name. When this reaches
     // zero, outside modules can count on the targets being correct. Before
     // then, all bets are off; future imports could override this name.
-    outstanding_references: uint,
+    outstanding_references: Cell<uint>,
 
     /// The value that this `use` directive names, if there is one.
     value_target: Option<Target>,
@@ -371,7 +371,7 @@ impl ImportResolution {
         ImportResolution {
             type_id: id,
             value_id: id,
-            outstanding_references: 0,
+            outstanding_references: Cell::new(0),
             value_target: None,
             type_target: None,
             is_public: is_public,
@@ -1968,7 +1968,8 @@ impl Resolver {
                     Some(&resolution) => {
                         debug!("(building import directive) bumping \
                                 reference");
-                        resolution.outstanding_references += 1;
+                        resolution.outstanding_references.set(
+                            resolution.outstanding_references.get() + 1);
 
                         // the source of this name is different now
                         resolution.type_id = id;
@@ -1977,7 +1978,7 @@ impl Resolver {
                     None => {
                         debug!("(building import directive) creating new");
                         let resolution = @mut ImportResolution::new(id, is_public);
-                        resolution.outstanding_references = 1;
+                        resolution.outstanding_references.set(1);
                         import_resolutions.get().insert(target.name,
                                                         resolution);
                     }
@@ -2328,7 +2329,7 @@ impl Resolver {
                         }
                     }
                     Some(import_resolution)
-                            if import_resolution.outstanding_references
+                            if import_resolution.outstanding_references.get()
                                 == 0 => {
 
                         fn get_binding(this: &mut Resolver,
@@ -2453,8 +2454,9 @@ impl Resolver {
         }
         let used_public = used_reexport || used_public;
 
-        assert!(import_resolution.outstanding_references >= 1);
-        import_resolution.outstanding_references -= 1;
+        assert!(import_resolution.outstanding_references.get() >= 1);
+        import_resolution.outstanding_references.set(
+            import_resolution.outstanding_references.get() - 1);
 
         // record what this import resolves to for later uses in documentation,
         // this may resolve to either a value or a type, but for documentation
@@ -3181,7 +3183,7 @@ impl Resolver {
         match import_resolutions.get().find(&name.name) {
             Some(import_resolution) => {
                 if import_resolution.is_public &&
-                        import_resolution.outstanding_references != 0 {
+                        import_resolution.outstanding_references.get() != 0 {
                     debug!("(resolving name in module) import \
                            unresolved; bailing out");
                     return Indeterminate;