From 608389132ac62e541dc1a62ba6311da61cec841d Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 20 Aug 2014 12:03:01 -0400 Subject: [PATCH 1/2] Use Attr::value() whenever possible --- src/components/script/dom/attr.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/script/dom/attr.rs b/src/components/script/dom/attr.rs index b5f2717697d..dc20378e60a 100644 --- a/src/components/script/dom/attr.rs +++ b/src/components/script/dom/attr.rs @@ -117,7 +117,7 @@ impl Attr { if namespace_is_null { vtable_for(node).before_remove_attr( self.local_name(), - self.value.deref().borrow().as_slice().to_string()); + self.value().as_slice().to_string()) } } FirstSetAttr => {} @@ -128,7 +128,7 @@ impl Attr { if namespace_is_null { vtable_for(node).after_set_attr( self.local_name(), - self.value.deref().borrow().as_slice().to_string()); + self.value().as_slice().to_string()) } } @@ -147,7 +147,7 @@ impl<'a> AttrMethods for JSRef<'a, Attr> { } fn Value(&self) -> DOMString { - self.value.deref().borrow().as_slice().to_string() + self.value().as_slice().to_string() } fn SetValue(&self, value: DOMString) { From 9061942664e2f444ced65ff6b7771ec8fb47f690 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 20 Aug 2014 12:17:17 -0400 Subject: [PATCH 2/2] Make AttrValue::as_slice impl from Str --- src/components/script/dom/attr.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/script/dom/attr.rs b/src/components/script/dom/attr.rs index dc20378e60a..961089fa2a6 100644 --- a/src/components/script/dom/attr.rs +++ b/src/components/script/dom/attr.rs @@ -56,7 +56,10 @@ impl AttrValue { AtomAttrValue(value) } - pub fn as_slice<'a>(&'a self) -> &'a str { +} + +impl Str for AttrValue { + fn as_slice<'a>(&'a self) -> &'a str { match *self { StringAttrValue(ref value) | TokenListAttrValue(ref value, _) |