From a377caa7e9d68a97156b968964bb7bc18444d13d Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Wed, 30 Nov 2016 13:45:10 +0100
Subject: Make Element::prefix return an Option<&DOMString>

---
 components/script/dom/node.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'components/script/dom/node.rs')

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 2985ad80cb3..f47d2583ae5 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -1738,7 +1738,7 @@ impl Node {
                     local: element.local_name().clone()
                 };
                 let element = Element::create(name,
-                    element.prefix().as_ref().map(|p| Prefix::from(&**p)),
+                    element.prefix().map(|p| Prefix::from(&**p)),
                     &document, ElementCreator::ScriptCreated);
                 Root::upcast::<Node>(element)
             },
@@ -1827,7 +1827,7 @@ impl Node {
             NodeTypeId::Element(_) => {
                 let element = node.downcast::<Element>().unwrap();
                 // Step 1.
-                if *element.namespace() != ns!() && *element.prefix() == prefix {
+                if *element.namespace() != ns!() && element.prefix() == prefix.as_ref() {
                     return element.namespace().clone()
                 }
 
@@ -2236,7 +2236,7 @@ impl NodeMethods for Node {
             let element = node.downcast::<Element>().unwrap();
             let other_element = other.downcast::<Element>().unwrap();
             (*element.namespace() == *other_element.namespace()) &&
-            (*element.prefix() == *other_element.prefix()) &&
+            (element.prefix() == other_element.prefix()) &&
             (*element.local_name() == *other_element.local_name()) &&
             (element.attrs().len() == other_element.attrs().len())
         }
-- 
cgit v1.2.3