From 2789750f6695377dd9f6e996aee650b576a111e3 Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Fri, 26 Sep 2014 15:36:39 -0700 Subject: [PATCH] Make the AttrHelpers trait use extended_deref --- components/script/dom/attr.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index fe1a57c4440..eaab5263507 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -147,14 +147,14 @@ impl<'a> AttrMethods for JSRef<'a, Attr> { } } -pub trait AttrHelpers { +pub trait AttrHelpers<'a> { fn set_value(self, set_type: AttrSettingType, value: AttrValue); - fn value<'a>(&'a self) -> Ref<'a, AttrValue>; - fn local_name<'a>(&'a self) -> &'a Atom; + fn value(self) -> Ref<'a, AttrValue>; + fn local_name(self) -> &'a Atom; fn summarize(self) -> AttrInfo; } -impl<'a> AttrHelpers for JSRef<'a, Attr> { +impl<'a> AttrHelpers<'a> for JSRef<'a, Attr> { fn set_value(self, set_type: AttrSettingType, value: AttrValue) { let owner = self.owner.root(); let node: JSRef = NodeCast::from_ref(*owner); @@ -180,12 +180,12 @@ impl<'a> AttrHelpers for JSRef<'a, Attr> { } } - fn value<'a>(&'a self) -> Ref<'a, AttrValue> { - self.value.deref().borrow() + fn value(self) -> Ref<'a, AttrValue> { + self.extended_deref().value.borrow() } - fn local_name<'a>(&'a self) -> &'a Atom { - &self.local_name + fn local_name(self) -> &'a Atom { + &self.extended_deref().local_name } fn summarize(self) -> AttrInfo {