about summary refs log tree commit diff
path: root/src/libcore/task
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-09-26 16:27:12 -0700
committerBrian Anderson <banderson@mozilla.com>2012-09-26 20:15:23 -0700
commite8fe718bfd4d88b0bc59117326a14a10f2598568 (patch)
tree5fdc1f4bfbd51f490ee30a846491f4c0e6dfac4b /src/libcore/task
parent64de6d638da71f7b3a55d663b194b95f7f06d6c8 (diff)
downloadrust-e8fe718bfd4d88b0bc59117326a14a10f2598568.tar.gz
rust-e8fe718bfd4d88b0bc59117326a14a10f2598568.zip
core: Replace map/map_default with map_ref/map_default_ref
Diffstat (limited to 'src/libcore/task')
-rw-r--r--src/libcore/task/local_data_priv.rs6
-rw-r--r--src/libcore/task/spawn.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/task/local_data_priv.rs b/src/libcore/task/local_data_priv.rs
index 2fbb88327ed..31369c47c64 100644
--- a/src/libcore/task/local_data_priv.rs
+++ b/src/libcore/task/local_data_priv.rs
@@ -75,8 +75,8 @@ unsafe fn local_data_lookup<T: Owned>(
     );
     do map_pos.map |index| {
         // .get() is guaranteed because of "None { false }" above.
-        let (_, data_ptr, _) = (*map)[index].get();
-        (index, data_ptr)
+        let (_, data_ptr, _) = (*map)[*index].get();
+        (*index, data_ptr)
     }
 }
 
@@ -91,7 +91,7 @@ unsafe fn local_get_helper<T: Owned>(
         // was referenced in the local_data box, though, not here, so before
         // overwriting the local_data_box we need to give an extra reference.
         // We must also give an extra reference when not removing.
-        let (index, data_ptr) = result;
+        let (index, data_ptr) = *result;
         let data: @T = cast::transmute(move data_ptr);
         cast::bump_box_refcount(data);
         if do_pop {
diff --git a/src/libcore/task/spawn.rs b/src/libcore/task/spawn.rs
index 21f217d57f4..f2568414392 100644
--- a/src/libcore/task/spawn.rs
+++ b/src/libcore/task/spawn.rs
@@ -200,7 +200,7 @@ fn each_ancestor(list:        &mut AncestorList,
         // the end of the list, which doesn't make sense to coalesce.
         return do (**ancestors).map_default((None,false)) |ancestor_arc| {
             // NB: Takes a lock! (this ancestor node)
-            do access_ancestors(&ancestor_arc) |nobe| {
+            do access_ancestors(ancestor_arc) |nobe| {
                 // Check monotonicity
                 assert last_generation > nobe.generation;
                 /*##########################################################*