about summary refs log tree commit diff
path: root/src/libsync
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsync')
-rw-r--r--src/libsync/future.rs2
-rw-r--r--src/libsync/sync/mod.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsync/future.rs b/src/libsync/future.rs
index 479174d17af..9984d2dd0ad 100644
--- a/src/libsync/future.rs
+++ b/src/libsync/future.rs
@@ -26,7 +26,7 @@
 
 #[allow(missing_doc)];
 
-use std::util::replace;
+use std::mem::replace;
 
 /// A type encapsulating the result of a computation which may not be complete
 pub struct Future<A> {
diff --git a/src/libsync/sync/mod.rs b/src/libsync/sync/mod.rs
index cfff31e08d4..0ac385ea1d1 100644
--- a/src/libsync/sync/mod.rs
+++ b/src/libsync/sync/mod.rs
@@ -20,10 +20,10 @@
 use std::cast;
 use std::comm;
 use std::kinds::marker;
+use std::mem::replace;
 use std::sync::arc::UnsafeArc;
 use std::sync::atomics;
 use std::unstable::finally::Finally;
-use std::util;
 
 use arc::MutexArc;
 
@@ -290,7 +290,7 @@ impl<'a> Condvar<'a> {
                     // To avoid :broadcast_heavy, we make a new waitqueue,
                     // swap it out with the old one, and broadcast on the
                     // old one outside of the little-lock.
-                    queue = Some(util::replace(&mut state.blocked[condvar_id],
+                    queue = Some(replace(&mut state.blocked[condvar_id],
                                                WaitQueue::new()));
                 } else {
                     out_of_bounds = Some(state.blocked.len());