---

yaml
---
r: 94702
b: refs/heads/try
c: c10d717
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 5fe84118a66c0f37bc8bcb3e3a0b8a235440a5ad
+refs/heads/try: c10d7177db81bd207705a92f6453f82ab11521a7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -358,7 +358,7 @@ struct ImportResolution {
     value_target: RefCell<Option<Target>>,
     /// The source node of the `use` directive leading to the value target
     /// being non-none
-    value_id: NodeId,
+    value_id: Cell<NodeId>,
 
     /// The type that this `use` directive names, if there is one.
     type_target: Option<Target>,
@@ -371,7 +371,7 @@ impl ImportResolution {
     fn new(id: NodeId, is_public: bool) -> ImportResolution {
         ImportResolution {
             type_id: id,
-            value_id: id,
+            value_id: Cell::new(id),
             outstanding_references: Cell::new(0),
             value_target: RefCell::new(None),
             type_target: None,
@@ -390,7 +390,7 @@ impl ImportResolution {
     fn id(&self, namespace: Namespace) -> NodeId {
         match namespace {
             TypeNS  => self.type_id,
-            ValueNS => self.value_id,
+            ValueNS => self.value_id.get(),
         }
     }
 }
@@ -1974,7 +1974,7 @@ impl Resolver {
 
                         // the source of this name is different now
                         resolution.type_id = id;
-                        resolution.value_id = id;
+                        resolution.value_id.set(id);
                     }
                     None => {
                         debug!("(building import directive) creating new");
@@ -2421,7 +2421,7 @@ impl Resolver {
                 debug!("(resolving single import) found value target");
                 import_resolution.value_target.set(
                     Some(Target::new(target_module, name_bindings)));
-                import_resolution.value_id = directive.id;
+                import_resolution.value_id.set(directive.id);
                 used_public = name_bindings.defined_in_public_namespace(ValueNS);
             }
             UnboundResult => { /* Continue. */ }
@@ -2598,7 +2598,7 @@ impl Resolver {
                 debug!("(resolving glob import) ... for value target");
                 dest_import_resolution.value_target.set(
                     Some(Target::new(containing_module, name_bindings)));
-                dest_import_resolution.value_id = id;
+                dest_import_resolution.value_id.set(id);
             }
             if name_bindings.defined_in_public_namespace(TypeNS) {
                 debug!("(resolving glob import) ... for type target");