diff options
Diffstat (limited to 'components/layout/flow_ref.rs')
-rw-r--r-- | components/layout/flow_ref.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/layout/flow_ref.rs b/components/layout/flow_ref.rs index e61d726707c..eb2b4e03c8d 100644 --- a/components/layout/flow_ref.rs +++ b/components/layout/flow_ref.rs @@ -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) } } } |