Switch to markup5ever's version of Atom and upgrade xml5ever (#34)

`html5ever` was just rexporting `markup5ever`'s version of Atom's so it
makes sense to loosen the dependencies and switch to the ones in
`markup5ever`. This should make it easier to keep things up to date in
the future.

In addition, we are now using the latest version of `xml5ever`.

Author: mrobinson

Cargo.lock

@@ -54,7 +54,6 @@ gstreamer-gl-wayland = { version = "0.21" }
 gstreamer-sys = "0.21"
 gstreamer-video = "0.21"
 headers = "0.3"
-html5ever = "0.26"
 http = "0.2"
 hyper = "0.14"
 hyper-rustls = { version = "0.24", default-features = false, features = ["acceptor", "http1", "http2", "logging", "tls12", "webpki-tokio"] }
@@ -72,6 +71,7 @@ lazy_static = "1.4"
 libc = "0.2"
 log = "0.4"
 malloc_size_of_derive = "0.1"
+markup5ever = "0.12"
 mime = "0.3.13"
 mime_guess = "2.0.3"
 mozangle = "0.5.1"
@@ -125,4 +125,4 @@ wgpu-core = "0.18"
 wgpu-types = "0.18"
 winapi = "0.3"
 xi-unicode = "0.1.0"
-xml5ever = "0.17"
+xml5ever = "0.18"

Cargo.toml

@@ -18,7 +18,7 @@ doctest = false
 
 [features]
 gecko = ["style_traits/gecko", "bindgen", "regex", "toml", "mozbuild"]
-servo = ["serde", "style_traits/servo", "servo_atoms", "html5ever",
+servo = ["serde", "style_traits/servo", "servo_atoms", "markup5ever",
          "cssparser/serde", "encoding_rs", "malloc_size_of/servo",
          "string_cache", "to_shmem/servo", "servo_arc/servo", "url"]
 gecko_debug = []
@@ -35,7 +35,6 @@ derive_more = { version = "0.99", default-features = false, features = ["add", "
 encoding_rs = { version = "0.8", optional = true }
 euclid = "0.22"
 fxhash = "0.2"
-html5ever = { version = "0.26", optional = true }
 icu_segmenter = { version = "1.4", default-features = false, features = ["auto", "compiled_data"] }
 indexmap = "1.0"
 itertools = "0.10"
@@ -44,6 +43,7 @@ lazy_static = "1"
 log = { version = "0.4", features = ["std"] }
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
+markup5ever = { workspace = true, optional = true }
 matches = "0.1"
 mime = "0.3.13"
 new_debug_unreachable = "1.0"

style/Cargo.toml

@@ -41,7 +41,7 @@ extern crate gecko_profiler;
 pub mod gecko_string_cache;
 #[cfg(feature = "servo")]
 #[macro_use]
-extern crate html5ever;
+extern crate markup5ever;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
@@ -154,13 +154,13 @@ pub use servo_atoms::Atom;
 
 #[cfg(feature = "servo")]
 #[allow(missing_docs)]
-pub type LocalName = crate::values::GenericAtomIdent<html5ever::LocalNameStaticSet>;
+pub type LocalName = crate::values::GenericAtomIdent<markup5ever::LocalNameStaticSet>;
 #[cfg(feature = "servo")]
 #[allow(missing_docs)]
-pub type Namespace = crate::values::GenericAtomIdent<html5ever::NamespaceStaticSet>;
+pub type Namespace = crate::values::GenericAtomIdent<markup5ever::NamespaceStaticSet>;
 #[cfg(feature = "servo")]
 #[allow(missing_docs)]
-pub type Prefix = crate::values::GenericAtomIdent<html5ever::PrefixStaticSet>;
+pub type Prefix = crate::values::GenericAtomIdent<markup5ever::PrefixStaticSet>;
 
 pub use style_traits::arc_slice::ArcSlice;
 pub use style_traits::owned_slice::OwnedSlice;

style/lib.rs

@@ -68,17 +68,17 @@ macro_rules! try_match_ident_ignore_ascii_case {
 #[cfg(feature = "servo")]
 macro_rules! local_name {
     ($s:tt) => {
-        $crate::values::GenericAtomIdent(html5ever::local_name!($s))
+        $crate::values::GenericAtomIdent(markup5ever::local_name!($s))
     };
 }
 
 #[cfg(feature = "servo")]
 macro_rules! ns {
     () => {
-        $crate::values::GenericAtomIdent(html5ever::ns!())
+        $crate::values::GenericAtomIdent(markup5ever::ns!())
     };
     ($s:tt) => {
-        $crate::values::GenericAtomIdent(html5ever::ns!($s))
+        $crate::values::GenericAtomIdent(markup5ever::ns!($s))
     };
 }
 

style/macros.rs

@@ -442,8 +442,8 @@ impl ::selectors::SelectorImpl for SelectorImpl {
     type LocalName = LocalName;
     type NamespacePrefix = Prefix;
     type NamespaceUrl = Namespace;
-    type BorrowedLocalName = html5ever::LocalName;
-    type BorrowedNamespaceUrl = html5ever::Namespace;
+    type BorrowedLocalName = markup5ever::LocalName;
+    type BorrowedNamespaceUrl = markup5ever::Namespace;
 }
 
 impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {