Bug 1906465 - Use markup5ever in Servo's Stylo instead of html5ever r=emilio

Use `markup5ever` in Servo. Note that this change should not affect
 Gecko at all.

Differential Revision: https://phabricator.services.mozilla.com/D215844

Author: mrobinson

style/Cargo.toml

@@ -27,9 +27,21 @@ gecko = [
     "style_traits/gecko",
     "toml"
 ]
-servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
-         "cssparser/serde", "encoding_rs", "malloc_size_of/servo", "arrayvec/use_union",
-         "string_cache", "to_shmem/servo", "servo_arc/servo", "url"]
+servo = [
+    "arrayvec/use_union",
+    "cssparser/serde",
+    "encoding_rs",
+    "malloc_size_of/servo",
+    "markup5ever",
+    "serde",
+    "servo_arc/servo",
+    "servo_atoms",
+    "servo_config",
+    "string_cache",
+    "style_traits/servo",
+    "to_shmem/servo",
+    "url"
+]
 gecko_debug = []
 gecko_refcount_logging = []
 
@@ -46,7 +58,6 @@ new_debug_unreachable = "1.0"
 encoding_rs = {version = "0.8", optional = true}
 euclid = "0.22"
 fxhash = "0.2"
-html5ever = {version = "0.24", optional = true}
 icu_segmenter = { version = "1.5", default-features = false, features = ["auto", "compiled_data"] }
 indexmap = {version = "2", features = ["std"]}
 itertools = "0.10"
@@ -55,6 +66,7 @@ lazy_static = "1"
 log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
+markup5ever = { version = "0.12", optional = true }
 matches = "0.1"
 nsstring = {path = "../../../xpcom/rust/nsstring/", optional = true}
 num_cpus = {version = "1.1.0"}

style/lib.rs

@@ -38,9 +38,6 @@ extern crate gecko_profiler;
 #[cfg(feature = "gecko")]
 #[macro_use]
 pub mod gecko_string_cache;
-#[cfg(feature = "servo")]
-#[macro_use]
-extern crate html5ever;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
@@ -49,6 +46,9 @@ extern crate log;
 extern crate malloc_size_of;
 #[macro_use]
 extern crate malloc_size_of_derive;
+#[cfg(feature = "servo")]
+#[macro_use]
+extern crate markup5ever;
 #[allow(unused_extern_crates)]
 #[macro_use]
 extern crate matches;
@@ -155,13 +155,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/macros.rs

@@ -41,17 +41,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))
     };
 }