diff options
Diffstat (limited to 'src/libstd/comm')
| -rw-r--r-- | src/libstd/comm/select.rs | 12 | ||||
| -rw-r--r-- | src/libstd/comm/sync.rs | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs index cebfeb5399e..ed884647fb6 100644 --- a/src/libstd/comm/select.rs +++ b/src/libstd/comm/select.rs @@ -45,11 +45,11 @@ #![allow(dead_code)] -use cast; use cell::Cell; use iter::Iterator; -use kinds::marker; use kinds::Send; +use kinds::marker; +use mem; use ops::Drop; use option::{Some, None, Option}; use owned::Box; @@ -247,8 +247,8 @@ impl<'rx, T: Send> Handle<'rx, T> { /// while it is added to the `Select` set. pub unsafe fn add(&mut self) { if self.added { return } - let selector: &mut Select = cast::transmute(&*self.selector); - let me: *mut Handle<'static, ()> = cast::transmute(&*self); + let selector: &mut Select = mem::transmute(&*self.selector); + let me: *mut Handle<'static, ()> = mem::transmute(&*self); if selector.head.is_null() { selector.head = me; @@ -268,8 +268,8 @@ impl<'rx, T: Send> Handle<'rx, T> { pub unsafe fn remove(&mut self) { if !self.added { return } - let selector: &mut Select = cast::transmute(&*self.selector); - let me: *mut Handle<'static, ()> = cast::transmute(&*self); + let selector: &mut Select = mem::transmute(&*self.selector); + let me: *mut Handle<'static, ()> = mem::transmute(&*self); if self.prev.is_null() { assert_eq!(selector.head, me); diff --git a/src/libstd/comm/sync.rs b/src/libstd/comm/sync.rs index db3f90cad5a..819e885526c 100644 --- a/src/libstd/comm/sync.rs +++ b/src/libstd/comm/sync.rs @@ -33,7 +33,6 @@ /// of a synchronous channel. There are a few branches for the unbuffered case, /// but they're mostly just relevant to blocking senders. -use cast; use container::Container; use iter::Iterator; use kinds::Send; @@ -187,7 +186,7 @@ impl<T: Send> Packet<T> { NoneBlocked if state.cap == 0 => { let mut canceled = false; assert!(state.canceled.is_none()); - state.canceled = Some(unsafe { cast::transmute(&mut canceled) }); + state.canceled = Some(unsafe { mem::transmute(&mut canceled) }); wait(&mut state.blocker, BlockedSender, &self.lock); if canceled {Err(state.buf.dequeue())} else {Ok(())} } |
