From e9ff91e9beb6c92d9662242c1090c507b1611c59 Mon Sep 17 00:00:00 2001 From: Edward Wang Date: Sat, 1 Feb 2014 04:35:36 +0800 Subject: Move replace and swap to std::mem. Get rid of std::util Also move Void to std::any, move drop to std::mem and reexport in prelude. --- src/libsync/sync/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libsync/sync') 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()); -- cgit 1.4.1-3-g733a5