Users of {ht,x}ml5ever don’t need to use markup5ever directly.

Author: SimonSapin

html5ever/examples/noop-tree-builder.rs

@@ -7,8 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use] extern crate markup5ever;
-extern crate html5ever;
+#[macro_use] extern crate html5ever;
 
 use std::io;
 use std::default::Default;

html5ever/examples/print-rcdom.rs

@@ -7,10 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use] 
-extern crate markup5ever;
-
-extern crate html5ever;
+#[macro_use] extern crate html5ever;
 extern crate tendril;
 
 use std::io;

html5ever/examples/print-tree-actions.rs

@@ -7,8 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use] extern crate markup5ever;
-extern crate html5ever;
+#[macro_use] extern crate html5ever;
 
 use std::io;
 use std::default::Default;

html5ever/tests/serializer.rs

@@ -8,13 +8,9 @@
 // except according to those terms.
 
 extern crate tendril;
-extern crate html5ever;
-
-#[macro_use] 
-extern crate markup5ever;
+#[macro_use] extern crate html5ever;
 
 use std::default::Default;
-
 use tendril::{StrTendril, SliceExt, TendrilSink};
 
 use html5ever::driver::ParseOpts;

html5ever/tests/tokenizer.rs

@@ -9,8 +9,7 @@
 
 extern crate rustc_serialize;
 extern crate test;
-extern crate html5ever;
-#[macro_use] extern crate markup5ever;
+#[macro_use] extern crate html5ever;
 
 mod foreach_html5lib_test;
 use foreach_html5lib_test::foreach_html5lib_test;

html5ever/tests/tree_builder.rs

@@ -9,9 +9,7 @@
 
 extern crate test;
 extern crate tendril;
-extern crate html5ever;
-
-#[macro_use] extern crate markup5ever;
+#[macro_use] extern crate html5ever;
 
 mod foreach_html5lib_test;
 use foreach_html5lib_test::foreach_html5lib_test;

xml5ever/src/lib.rs

@@ -38,7 +38,6 @@
 extern crate phf;
 extern crate time;
 
-
 pub use markup5ever::*;
 
 /// Re-export the tendril crate so that users don’t need to depend on it.

xml5ever/tests/tokenizer.rs

@@ -9,9 +9,7 @@
 
 extern crate rustc_serialize;
 extern crate test;
-
-extern crate xml5ever;
-extern crate markup5ever;
+#[macro_use] extern crate xml5ever;
 
 use std::borrow::Cow::Borrowed;
 use std::env;
@@ -20,13 +18,12 @@ use std::mem::replace;
 use std::path::Path;
 use std::collections::BTreeMap;
 use rustc_serialize::json::Json;
-use markup5ever::{Attribute, QualName};
 
 use test::{TestDesc, TestDescAndFn, DynTestName, DynTestFn};
 use test::ShouldPanic::No;
 use util::find_tests::foreach_xml5lib_test;
 
-use xml5ever::{LocalName, Namespace};
+use xml5ever::{LocalName, Attribute, QualName};
 use xml5ever::tendril::{StrTendril, SliceExt};
 use xml5ever::tokenizer::{Tag, StartTag, EndTag, CommentToken, EmptyTag, ShortTag};
 use xml5ever::tokenizer::{Token, CharacterTokens, TokenSink};
@@ -201,12 +198,6 @@ impl JsonExt for Json {
     }
 }
 
-macro_rules! ns {
-    () => {
-        Namespace::default()
-    }
-}
-
 // Parse a JSON object (other than "ParseError") to a token.
 fn json_to_token(js: &Json) -> Token {
     let parts = js.as_array().unwrap();

xml5ever/tests/tree_builder.rs

@@ -9,12 +9,9 @@
 
 #![cfg_attr(feature = "unstable", feature(start, test))]
 
-extern crate test;
-
-#[macro_use] extern crate markup5ever;
-
 extern crate rustc_serialize;
-extern crate xml5ever;
+extern crate test;
+#[macro_use] extern crate xml5ever;
 
 use std::collections::{HashSet, HashMap};
 use std::ffi::OsStr;