servo · bors-servo · Oct 22, 2019 · Oct 22, 2019
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "html5lib-tests"]
-	path = html5ever/html5lib-tests
+	path = rcdom/html5lib-tests
 	url = https://github.com/html5lib/html5lib-tests
 [submodule "xml5lib-tests"]
-	path = xml5ever/xml5lib-tests
+	path = rcdom/xml5lib-tests
 	url = https://github.com/Ygg01/xml5lib-tests
diff --git a/html5ever/Cargo.toml b/html5ever/Cargo.toml
@@ -11,33 +11,14 @@ build = "build.rs"
 categories = [ "parser-implementations", "web-programming" ]
 edition = "2018"
 
-[lib]
-name = "html5ever"
-
-doctest = true
-
-[[test]]
-name = "tree_builder"
-harness = false
-
-[[test]]
-name = "tokenizer"
-harness = false
-
-[[test]]
-name = "serializer"
-
 [dependencies]
 log = "0.4"
 mac = "0.1"
 markup5ever = { version = "0.10", path = "../markup5ever" }
 
 [dev-dependencies]
-serde_json = "1.0"
-rustc-test = "0.3"
 typed-arena = "1.3.0"
 criterion = "0.3"
-markup5ever_rcdom = { version = "0.1", path = "../rcdom" }
 
 [build-dependencies]
 quote = "1"

diff --git a/html5ever/benches/html5ever.rs b/html5ever/benches/html5ever.rs
@@ -9,7 +9,7 @@ use criterion::{black_box, Criterion};
 
 use html5ever::tendril::*;
 use html5ever::tokenizer::{
-    BufferQueue, Token, TokenSink, TokenSinkResult, Tokenizer, TokenizerOpts,
+    BufferQueue, Token, TokenSink, TokenSinkResult, Tokenizer,
 };
 
 struct Sink;

diff --git a/html5ever/src/driver.rs b/html5ever/src/driver.rs
@@ -134,26 +134,3 @@ impl<Sink: TreeSink> Parser<Sink> {
         Utf8LossyDecoder::new(self)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    extern crate markup5ever_rcdom;
-    use super::*;
-    use self::markup5ever_rcdom::{RcDom, SerializableHandle};
-    use crate::serialize::serialize;
-    use tendril::TendrilSink;
-
-    #[test]
-    fn from_utf8() {
-        let dom = parse_document(RcDom::default(), ParseOpts::default())
-            .from_utf8()
-            .one("<title>Test".as_bytes());
-        let mut serialized = Vec::new();
-        let document: SerializableHandle = dom.document.clone().into();
-        serialize(&mut serialized, &document, Default::default()).unwrap();
-        assert_eq!(
-            String::from_utf8(serialized).unwrap().replace(" ", ""),
-            "<html><head><title>Test</title></head><body></body></html>"
-        );
-    }
-}
diff --git a/html5ever/src/tree_builder/mod.rs b/html5ever/src/tree_builder/mod.rs
@@ -1679,171 +1679,3 @@ where
         }
     }
 }
-
-#[cfg(test)]
-#[allow(non_snake_case)]
-mod test {
-    extern crate markup5ever_rcdom as rcdom;
-    use markup5ever::interface::{AppendNode, AppendText, NodeOrText};
-    use markup5ever::interface::{ElementFlags, Tracer, TreeSink};
-    use markup5ever::interface::{LimitedQuirks, NoQuirks, Quirks, QuirksMode};
-
-    use super::types::*;
-
-    use crate::tendril::stream::{TendrilSink, Utf8LossyDecoder};
-    use crate::tendril::StrTendril;
-    use crate::ExpandedName;
-    use crate::QualName;
-
-    use crate::tokenizer;
-    use crate::tokenizer::states as tok_state;
-    use crate::tokenizer::{Doctype, StartTag, Tag, TokenSink};
-    use crate::tokenizer::{Tokenizer, TokenizerOpts};
-    use crate::driver::*;
-
-    use crate::util::str::is_ascii_whitespace;
-
-    use std::borrow::Cow;
-    use std::borrow::Cow::Borrowed;
-    use std::collections::VecDeque;
-    use std::default::Default;
-    use std::mem::replace;
-
-    use super::{TreeBuilder, TreeBuilderOpts};
-    use markup5ever::{Attribute, local_name, namespace_url, ns};
-    use self::rcdom::{Handle, Node, NodeData, RcDom};
-
-    pub struct LineCountingDOM {
-        pub line_vec: Vec<(QualName, u64)>,
-        pub current_line: u64,
-        pub rcdom: RcDom,
-    }
-
-    impl TreeSink for LineCountingDOM {
-        type Output = Self;
-
-        fn finish(self) -> Self {
-            self
-        }
-
-        type Handle = Handle;
-
-        fn parse_error(&mut self, msg: Cow<'static, str>) {
-            self.rcdom.parse_error(msg);
-        }
-
-        fn get_document(&mut self) -> Handle {
-            self.rcdom.get_document()
-        }
-
-        fn get_template_contents(&mut self, target: &Handle) -> Handle {
-            self.rcdom.get_template_contents(target)
-        }
-
-        fn set_quirks_mode(&mut self, mode: QuirksMode) {
-            self.rcdom.set_quirks_mode(mode)
-        }
-
-        fn same_node(&self, x: &Handle, y: &Handle) -> bool {
-            self.rcdom.same_node(x, y)
-        }
-
-        fn elem_name<'a>(&'a self, target: &'a Handle) -> ExpandedName<'a> {
-            self.rcdom.elem_name(target)
-        }
-
-        fn create_element(
-            &mut self,
-            name: QualName,
-            attrs: Vec<Attribute>,
-            flags: ElementFlags,
-        ) -> Handle {
-            self.line_vec.push((name.clone(), self.current_line));
-            self.rcdom.create_element(name, attrs, flags)
-        }
-
-        fn create_comment(&mut self, text: StrTendril) -> Handle {
-            self.rcdom.create_comment(text)
-        }
-
-        fn create_pi(&mut self, target: StrTendril, content: StrTendril) -> Handle {
-            self.rcdom.create_pi(target, content)
-        }
-
-        fn append(&mut self, parent: &Handle, child: NodeOrText<Handle>) {
-            self.rcdom.append(parent, child)
-        }
-
-        fn append_before_sibling(&mut self, sibling: &Handle, child: NodeOrText<Handle>) {
-            self.rcdom.append_before_sibling(sibling, child)
-        }
-
-        fn append_based_on_parent_node(
-            &mut self,
-            element: &Handle,
-            prev_element: &Handle,
-            child: NodeOrText<Handle>,
-        ) {
-            self.rcdom
-                .append_based_on_parent_node(element, prev_element, child)
-        }
-
-        fn append_doctype_to_document(
-            &mut self,
-            name: StrTendril,
-            public_id: StrTendril,
-            system_id: StrTendril,
-        ) {
-            self.rcdom
-                .append_doctype_to_document(name, public_id, system_id);
-        }
-
-        fn add_attrs_if_missing(&mut self, target: &Handle, attrs: Vec<Attribute>) {
-            self.rcdom.add_attrs_if_missing(target, attrs);
-        }
-
-        fn remove_from_parent(&mut self, target: &Handle) {
-            self.rcdom.remove_from_parent(target);
-        }
-
-        fn reparent_children(&mut self, node: &Handle, new_parent: &Handle) {
-            self.rcdom.reparent_children(node, new_parent);
-        }
-
-        fn mark_script_already_started(&mut self, target: &Handle) {
-            self.rcdom.mark_script_already_started(target);
-        }
-
-        fn set_current_line(&mut self, line_number: u64) {
-            self.current_line = line_number;
-        }
-    }
-
-    #[test]
-    fn check_four_lines() {
-        // Input
-        let sink = LineCountingDOM {
-            line_vec: vec![],
-            current_line: 1,
-            rcdom: RcDom::default(),
-        };
-        let opts = ParseOpts::default();
-        let mut resultTok = parse_document(sink, opts);
-        resultTok.process(StrTendril::from("<a>\n"));
-        resultTok.process(StrTendril::from("</a>\n"));
-        resultTok.process(StrTendril::from("<b>\n"));
-        resultTok.process(StrTendril::from("</b>"));
-        // Actual Output
-        let actual = resultTok.finish();
-        // Expected Output
-        let expected = vec![
-            (QualName::new(None, ns!(html), local_name!("html")), 1),
-            (QualName::new(None, ns!(html), local_name!("head")), 1),
-            (QualName::new(None, ns!(html), local_name!("body")), 1),
-            (QualName::new(None, ns!(html), local_name!("a")), 1),
-            (QualName::new(None, ns!(html), local_name!("b")), 3),
-        ];
-        // Assertion
-        assert_eq!(actual.line_vec, expected);
-    }
-}
diff --git a/markup5ever/Cargo.toml b/markup5ever/Cargo.toml
@@ -25,6 +25,3 @@ phf_codegen = "0.8"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-
-[dev-dependencies]
-markup5ever_rcdom = { version = "0.1", path = "../rcdom" }
diff --git a/markup5ever/interface/tree_builder.rs b/markup5ever/interface/tree_builder.rs
@@ -80,32 +80,6 @@ pub struct ElementFlags {
 /// # Examples
 ///
 /// Create an element like `<div class="test-class-name"></div>`:
-///
-/// ```
-/// # #[macro_use] extern crate markup5ever;
-/// # extern crate markup5ever_rcdom as rcdom;
-///
-/// # fn main() {
-/// use markup5ever::{QualName, Attribute};
-/// use markup5ever::interface::create_element;
-///
-/// let mut dom = rcdom::RcDom::default();
-/// let el = create_element(&mut dom,
-///     // Namespaces and localnames use precomputed interned strings for
-///     // speed. Use the macros ns! and local_name! to fetch them.
-///     QualName::new(None, ns!(), local_name!("div")),
-///     vec![
-///         Attribute {
-///             name: QualName::new(None, ns!(), local_name!("class")),
-///             // In real scenarios, you would use a view onto an existing
-///             // string if possible to avoid allocation. Tendrils have utilities
-///             // for avoiding allocation & copying wherever possible.
-///             value: String::from("test-class-name").into()
-///         }
-///     ]);
-/// # }
-///
-/// ```
 pub fn create_element<Sink>(sink: &mut Sink, name: QualName, attrs: Vec<Attribute>) -> Sink::Handle
 where
     Sink: TreeSink,

diff --git a/rcdom/Cargo.toml b/rcdom/Cargo.toml
@@ -8,10 +8,34 @@ description = "Basic, unsupported DOM structure for use by tests in html5ever/xm
 readme = "README.md"
 documentation = "https://docs.rs/markup5ever_rcdom"
 categories = [ "parser-implementations", "web-programming" ]
+edition = "2018"
+publish = false
 
 [lib]
 path = "lib.rs"
 
 [dependencies]
 tendril = "0.4"
-markup5ever = { version = "0.10", path = "../markup5ever" }
+html5ever = { version = "0.25", path = "../html5ever" }
+markup5ever = { version = "0.10", path = "../markup5ever" }
+xml5ever = { version = "0.16", path = "../xml5ever" }
+
+[dev-dependencies]
+serde_json = "1.0"
+rustc-test = "0.3"
+
+[[test]]
+name = "html-tokenizer"
+harness = false
+
+[[test]]
+name = "html-tree-builder"
+harness = false
+
+[[test]]
+name = "xml-tree-builder"
+harness = false
+
+[[test]]
+name = "xml-tokenizer"
+harness = false
diff --git a/html5ever/data/test/ignore → rcdom/data/test/ignore b/html5ever/data/test/ignore → rcdom/data/test/ignore
diff --git a/xml5ever/examples/hello_xml.rs → rcdom/examples/hello_xml.rs b/xml5ever/examples/hello_xml.rs → rcdom/examples/hello_xml.rs
diff --git a/html5ever/examples/html2html.rs → rcdom/examples/html2html.rs b/html5ever/examples/html2html.rs → rcdom/examples/html2html.rs
diff --git a/html5ever/examples/print-rcdom.rs → rcdom/examples/print-rcdom.rs b/html5ever/examples/print-rcdom.rs → rcdom/examples/print-rcdom.rs
diff --git a/xml5ever/examples/xml_tree_printer.rs → rcdom/examples/xml_tree_printer.rs b/xml5ever/examples/xml_tree_printer.rs → rcdom/examples/xml_tree_printer.rs
diff --git a/html5ever/html5lib-tests → rcdom/html5lib-tests b/html5ever/html5lib-tests → rcdom/html5lib-tests
diff --git a/html5ever/tests/foreach_html5lib_test/mod.rs → rcdom/tests/foreach_html5lib_test/mod.rs b/html5ever/tests/foreach_html5lib_test/mod.rs → rcdom/tests/foreach_html5lib_test/mod.rs
diff --git a/rcdom/tests/html-driver.rs b/rcdom/tests/html-driver.rs
@@ -0,0 +1,18 @@
+use html5ever::driver;
+use html5ever::serialize;
+use html5ever::tendril::TendrilSink;
+use markup5ever_rcdom::{RcDom, SerializableHandle};
+
+#[test]
+fn from_utf8() {
+    let dom = driver::parse_document(RcDom::default(), Default::default())
+        .from_utf8()
+        .one("<title>Test".as_bytes());
+    let mut serialized = Vec::new();
+    let document: SerializableHandle = dom.document.clone().into();
+    serialize::serialize(&mut serialized, &document, Default::default()).unwrap();
+    assert_eq!(
+        String::from_utf8(serialized).unwrap().replace(" ", ""),
+        "<html><head><title>Test</title></head><body></body></html>"
+    );
+}
diff --git a/html5ever/tests/serializer.rs → rcdom/tests/html-serializer.rs b/html5ever/tests/serializer.rs → rcdom/tests/html-serializer.rs
@@ -7,18 +7,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use]
-extern crate html5ever;
-extern crate markup5ever_rcdom as rcdom;
-
-use std::default::Default;
-
 use html5ever::driver::ParseOpts;
 use html5ever::serialize::{Serialize, SerializeOpts, Serializer, TraversalScope};
 use html5ever::tendril::{SliceExt, StrTendril, TendrilSink};
 use html5ever::tokenizer::{TagKind, Token, TokenSink, TokenSinkResult, Tokenizer};
 use html5ever::{parse_document, parse_fragment, serialize, QualName};
-use rcdom::{RcDom, SerializableHandle};
+use markup5ever::{local_name, namespace_url, ns};
+use markup5ever_rcdom::{RcDom, SerializableHandle};
 
 use std::io;
 
@@ -258,7 +253,6 @@ fn deep_tree() {
     );
     let src = String::from("<b>".repeat(60_000));
     let dom = parser.one(src);
-    let document = &dom.document;
     let opts = SerializeOpts::default();
     let mut ret_val = Vec::new();
     let document: SerializableHandle = dom.document.clone().into();