auto merge of #11956 : edwardw/rust/issue-7556, r=cmr

Closes #7556.

Also move ``std::util::Void`` to ``std::any::Void``. It makes more sense to me.

1 files changed, 2 insertions, 2 deletions

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());