Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a

This commit is contained in:
Jack Moffitt 2014-11-05 12:33:11 -07:00 committed by Glenn Watson
parent 26045d7fcb
commit d1b433a3b3
160 changed files with 1427 additions and 1162 deletions

View file

@ -12,7 +12,7 @@ use flow;
use std::mem;
use std::ptr;
use std::raw;
use std::sync::atomics::SeqCst;
use std::sync::atomic::SeqCst;
#[unsafe_no_drop_flag]
pub struct FlowRef {
@ -33,18 +33,18 @@ impl FlowRef {
}
}
impl Deref<Flow + 'static> for FlowRef {
fn deref<'a>(&'a self) -> &'a Flow + 'static {
impl<'a> Deref<Flow + 'a> for FlowRef {
fn deref(&self) -> &Flow + 'a {
unsafe {
mem::transmute_copy::<raw::TraitObject, &'a Flow + 'static>(&self.object)
mem::transmute_copy::<raw::TraitObject, &Flow + 'a>(&self.object)
}
}
}
impl DerefMut<Flow + 'static> for FlowRef {
fn deref_mut<'a>(&'a mut self) -> &'a mut Flow + 'static {
impl<'a> DerefMut<Flow + 'a> for FlowRef {
fn deref_mut<'a>(&mut self) -> &mut Flow + 'a {
unsafe {
mem::transmute_copy::<raw::TraitObject, &'a mut Flow + 'static>(&self.object)
mem::transmute_copy::<raw::TraitObject, &mut Flow + 'a>(&self.object)
}
}
}