Upgrade to html5ever 0.16

components/layout/Cargo.toml

@@ -20,7 +20,7 @@ fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
-html5ever-atoms = "0.3"
+html5ever = "0.16"
 ipc-channel = "0.7"
 libc = "0.2"
 log = "0.3.5"

components/layout/lib.rs

@@ -22,7 +22,7 @@ extern crate fnv;
 extern crate gfx;
 extern crate gfx_traits;
 extern crate heapsize;
-#[macro_use] extern crate html5ever_atoms;
+#[macro_use] extern crate html5ever;
 extern crate ipc_channel;
 extern crate libc;
 #[macro_use]

components/script/Cargo.toml

@@ -46,8 +46,7 @@ fnv = "1.0"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.6"
 heapsize_derive = "0.1"
-html5ever = {version = "0.15", features = ["heap_size", "unstable"]}
-html5ever-atoms = {version = "0.3", features = ["heap_size"]}
+html5ever = {version = "0.16", features = ["heap_size", "unstable"]}
 hyper = "0.10"
 hyper_serde = "0.6"
 image = "0.12"
@@ -88,7 +87,7 @@ time = "0.1.12"
 unicode-segmentation = "1.1.0"
 url = {version = "1.2", features = ["heap_size", "query_encoding"]}
 uuid = {version = "0.4", features = ["v4"]}
-xml5ever = {version = "0.5", features = ["unstable"]}
+xml5ever = {version = "0.6", features = ["unstable"]}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}

components/script/dom/attr.rs

@@ -13,7 +13,7 @@ use dom::element::{AttributeMutation, Element};
 use dom::virtualmethods::vtable_for;
 use dom::window::Window;
 use dom_struct::dom_struct;
-use html5ever_atoms::{Prefix, LocalName, Namespace};
+use html5ever::{Prefix, LocalName, Namespace};
 use servo_atoms::Atom;
 use std::borrow::ToOwned;
 use std::cell::Ref;

components/script/dom/bindings/str.rs

@@ -4,7 +4,7 @@
 
 //! The `ByteString` struct.
 
-use html5ever_atoms::{LocalName, Namespace};
+use html5ever::{LocalName, Namespace};
 use servo_atoms::Atom;
 use std::ascii::AsciiExt;
 use std::borrow::{Borrow, Cow, ToOwned};

components/script/dom/bindings/trace.rs

@@ -47,8 +47,8 @@ use euclid::{Matrix2D, Matrix4D, Point2D};
 use euclid::length::Length as EuclidLength;
 use euclid::rect::Rect;
 use euclid::size::Size2D;
-use html5ever::tokenizer::buffer_queue::BufferQueue;
-use html5ever_atoms::{Prefix, LocalName, Namespace, QualName};
+use html5ever::{Prefix, LocalName, Namespace, QualName};
+use html5ever::buffer_queue::BufferQueue;
 use hyper::header::Headers;
 use hyper::method::Method;
 use hyper::mime::Mime;

components/script/dom/bindings/xmlname.rs

@@ -6,7 +6,7 @@
 
 use dom::bindings::error::{Error, ErrorResult, Fallible};
 use dom::bindings::str::DOMString;
-use html5ever_atoms::{Prefix, LocalName, Namespace};
+use html5ever::{Prefix, LocalName, Namespace};
 
 /// Validate a qualified name. See https://dom.spec.whatwg.org/#validate for details.
 pub fn validate_qualified_name(qualified_name: &str) -> ErrorResult {

components/script/dom/create.rs

@@ -77,7 +77,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;
 use servo_config::prefs::PREFS;
 
 fn create_svg_element(name: QualName,
@@ -274,13 +274,12 @@ 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.as_ref().map(|p| DOMString::from(&**p));
 
     match name.ns {
         ns!(html)   => create_html_element(name, prefix, document, creator),

components/script/dom/document.rs

@@ -93,7 +93,7 @@ use dom_struct::dom_struct;
 use encoding::EncodingRef;
 use encoding::all::UTF_8;
 use euclid::point::Point2D;
-use html5ever_atoms::{LocalName, QualName};
+use html5ever::{LocalName, QualName};
 use hyper::header::{Header, SetCookie};
 use hyper_serde::Serde;
 use ipc_channel::ipc::{self, IpcSender};
@@ -2733,7 +2733,7 @@ impl DocumentMethods for Document {
                               -> Root<HTMLCollection> {
         let ns = namespace_from_domstring(maybe_ns);
         let local = LocalName::from(tag_name);
-        let qname = QualName::new(ns, local);
+        let qname = QualName::new(None, ns, local);
         match self.tagns_map.borrow_mut().entry(qname.clone()) {
             Occupied(entry) => Root::from_ref(entry.get()),
             Vacant(entry) => {
@@ -2782,8 +2782,8 @@ impl DocumentMethods for Document {
             ns!()
         };
 
-        let name = QualName::new(ns, LocalName::from(local_name));
-        Ok(Element::create(name, None, self, ElementCreator::ScriptCreated))
+        let name = QualName::new(None, ns, LocalName::from(local_name));
+        Ok(Element::create(name, self, ElementCreator::ScriptCreated))
     }
 
     // https://dom.spec.whatwg.org/#dom-document-createelementns
@@ -2793,8 +2793,8 @@ impl DocumentMethods for Document {
                        -> Fallible<Root<Element>> {
         let (namespace, prefix, local_name) = try!(validate_and_extract(namespace,
                                                                         &qualified_name));
-        let name = QualName::new(namespace, local_name);
-        Ok(Element::create(name, prefix, self, ElementCreator::ScriptCreated))
+        let name = QualName::new(prefix, namespace, local_name);
+        Ok(Element::create(name, self, ElementCreator::ScriptCreated))
     }
 
     // https://dom.spec.whatwg.org/#dom-document-createattribute
@@ -3047,8 +3047,8 @@ impl DocumentMethods for Document {
             match elem {
                 Some(elem) => Root::upcast::<Node>(elem),
                 None => {
-                    let name = QualName::new(ns!(svg), local_name!("title"));
-                    let elem = Element::create(name, None, self, ElementCreator::ScriptCreated);
+                    let name = QualName::new(None, ns!(svg), local_name!("title"));
+                    let elem = Element::create(name, self, ElementCreator::ScriptCreated);
                     let parent = root.upcast::<Node>();
                     let child = elem.upcast::<Node>();
                     parent.InsertBefore(child, parent.GetFirstChild().r())
@@ -3064,9 +3064,8 @@ impl DocumentMethods for Document {
                 None => {
                     match self.GetHead() {
                         Some(head) => {
-                            let name = QualName::new(ns!(html), local_name!("title"));
+                            let name = QualName::new(None, ns!(html), local_name!("title"));
                             let elem = Element::create(name,
-                                                       None,
                                                        self,
                                                        ElementCreator::ScriptCreated);
                             head.upcast::<Node>()

components/script/dom/domtokenlist.rs

@@ -12,7 +12,7 @@ use dom::bindings::str::DOMString;
 use dom::element::Element;
 use dom::node::window_from_node;
 use dom_struct::dom_struct;
-use html5ever_atoms::LocalName;
+use html5ever::LocalName;
 use servo_atoms::Atom;
 use style::str::HTML_SPACE_CHARACTERS;
 

components/script/dom/element.rs

@@ -75,11 +75,11 @@ use dom::validation::Validatable;
 use dom::virtualmethods::{VirtualMethods, vtable_for};
 use dom::window::ReflowReason;
 use dom_struct::dom_struct;
+use html5ever::{Prefix, LocalName, Namespace, QualName};
 use html5ever::serialize;
 use html5ever::serialize::SerializeOpts;
 use html5ever::serialize::TraversalScope;
 use html5ever::serialize::TraversalScope::{ChildrenOnly, IncludeNode};
-use html5ever_atoms::{Prefix, LocalName, Namespace, QualName};
 use js::jsapi::{HandleValue, JSAutoCompartment};
 use net_traits::request::CorsSettings;
 use ref_filter_map::ref_filter_map;
@@ -195,10 +195,10 @@ impl<'a> TryFrom<&'a str> for AdjacentPosition {
 // Element methods
 //
 impl Element {
-    pub fn create(name: QualName, prefix: Option<Prefix>,
+    pub fn create(name: QualName,
                   document: &Document, creator: ElementCreator)
                   -> Root<Element> {
-        create_element(name, prefix, document, creator)
+        create_element(name, document, creator)
     }
 
     pub fn new_inherited(local_name: LocalName,
@@ -1955,8 +1955,8 @@ impl ElementMethods for Element {
 
             // Step 4.
             NodeTypeId::DocumentFragment => {
-                let body_elem = Element::create(QualName::new(ns!(html), local_name!("body")),
-                                                None, &context_document,
+                let body_elem = Element::create(QualName::new(None, ns!(html), local_name!("body")),
+                                                &context_document,
                                                 ElementCreator::ScriptCreated);
                 Root::upcast(body_elem)
             },

components/script/dom/formdata.rs

@@ -17,7 +17,7 @@ use dom::file::File;
 use dom::globalscope::GlobalScope;
 use dom::htmlformelement::{HTMLFormElement, FormDatumValue, FormDatum};
 use dom_struct::dom_struct;
-use html5ever_atoms::LocalName;
+use html5ever::LocalName;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::iter;

components/script/dom/htmlanchorelement.rs

@@ -25,7 +25,7 @@ use dom::node::{Node, document_from_node};
 use dom::urlhelper::UrlHelper;
 use dom::virtualmethods::VirtualMethods;
 use dom_struct::dom_struct;
-use html5ever_atoms::LocalName;
+use html5ever::LocalName;
 use net_traits::ReferrerPolicy;
 use num_traits::ToPrimitive;
 use script_traits::MozBrowserEvent;

components/script/dom/htmlappletelement.rs

@@ -12,7 +12,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::Node;
 use dom::virtualmethods::VirtualMethods;
 use dom_struct::dom_struct;
-use html5ever_atoms::LocalName;
+use html5ever::LocalName;
 use style::attr::AttrValue;
 
 #[dom_struct]

components/script/dom/htmlareaelement.rs

@@ -20,7 +20,7 @@ use dom::node::{Node, document_from_node};
 use dom::virtualmethods::VirtualMethods;
 use dom_struct::dom_struct;
 use euclid::point::Point2D;
-use html5ever_atoms::LocalName;
+use html5ever::LocalName;
 use net_traits::ReferrerPolicy;
 use std::default::Default;
 use std::f32;