diff options
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/construct.rs | 4 | ||||
-rw-r--r-- | components/layout/context.rs | 6 | ||||
-rw-r--r-- | components/layout/flow_ref.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index b877d4245f2..9e14e2244ab 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -222,8 +222,8 @@ pub struct FlowConstructor<'a> { impl<'a> FlowConstructor<'a> { /// Creates a new flow constructor. - pub fn new<'a>(layout_context: &'a LayoutContext<'a>) - -> FlowConstructor<'a> { + pub fn new<'b>(layout_context: &'b LayoutContext<'b>) + -> FlowConstructor<'b> { FlowConstructor { layout_context: layout_context, } diff --git a/components/layout/context.rs b/components/layout/context.rs index 977417e4fe9..e3df7a1a8b5 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -100,7 +100,7 @@ impl<'a> LayoutContext<'a> { } #[inline(always)] - pub fn font_context<'a>(&'a self) -> &'a mut FontContext { + pub fn font_context<'b>(&'b self) -> &'b mut FontContext { unsafe { let cached_context = &mut *self.cached_local_layout_context; &mut cached_context.font_context @@ -108,7 +108,7 @@ impl<'a> LayoutContext<'a> { } #[inline(always)] - pub fn applicable_declarations_cache<'a>(&'a self) -> &'a mut ApplicableDeclarationsCache { + pub fn applicable_declarations_cache<'b>(&'b self) -> &'b mut ApplicableDeclarationsCache { unsafe { let cached_context = &mut *self.cached_local_layout_context; &mut cached_context.applicable_declarations_cache @@ -116,7 +116,7 @@ impl<'a> LayoutContext<'a> { } #[inline(always)] - pub fn style_sharing_candidate_cache<'a>(&'a self) -> &'a mut StyleSharingCandidateCache { + pub fn style_sharing_candidate_cache<'b>(&'b self) -> &'b mut StyleSharingCandidateCache { unsafe { let cached_context = &mut *self.cached_local_layout_context; &mut cached_context.style_sharing_candidate_cache diff --git a/components/layout/flow_ref.rs b/components/layout/flow_ref.rs index 029f7fade89..605a7e4ede5 100644 --- a/components/layout/flow_ref.rs +++ b/components/layout/flow_ref.rs @@ -46,7 +46,7 @@ impl<'a> Deref for FlowRef { } } -impl<'a> DerefMut for FlowRef { +impl DerefMut for FlowRef { fn deref_mut<'a>(&mut self) -> &mut (Flow + 'a) { unsafe { mem::transmute_copy::<raw::TraitObject, &mut (Flow + 'a)>(&self.object) |