Solving merge conficts related to the html5ever_atoms -> html5ever change

1 files changed, 2 insertions, 6 deletions

diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs
index de20420d03f..91ea3e1e7da 100644
--- a/components/script/dom/create.rs
+++ b/components/script/dom/create.rs
@@ -76,7 +76,7 @@ use dom::htmlulistelement::HTMLUListElement;
 use dom::htmlunknownelement::HTMLUnknownElement;
 use dom::htmlvideoelement::HTMLVideoElement;
 use dom::svgsvgelement::SVGSVGElement;
-use html5ever_atoms::{Prefix, QualName};
+use html5ever::{QualName, Prefix};
 use servo_config::prefs::PREFS;
 
 fn create_svg_element(name: QualName,
@@ -273,14 +273,10 @@ fn create_html_element(name: QualName,
 }
 
 pub fn create_element(name: QualName,
-                      prefix: Option<Prefix>,
                       document: &Document,
                       creator: ElementCreator)
                       -> Root<Element> {
-    // FIXME(ajeffrey): Convert directly from Prefix to DOMString.
-
-    // let prefix = prefix.map(|p| DOMString::from(&*p));
-
+    let prefix = name.prefix.clone();
     match name.ns {
         ns!(html)   => create_html_element(name, prefix, document, creator),
         ns!(svg)    => create_svg_element(name, prefix, document),