Use tendril through markup5ever

Author: SimonSapin

html5ever/Cargo.toml

@@ -30,13 +30,12 @@ name = "tokenizer"
 harness = false
 
 [features]
-unstable = ["tendril/unstable"]
+unstable = ["markup5ever/unstable"]
 heap_size = ["markup5ever/heap_size"]
 
 [dependencies]
-log = "0"
-mac = "0"
-tendril = "0.2.2"
+log = "0.3"
+mac = "0.1"
 markup5ever = { version = "0.1", path = "../markup5ever" }
 
 [dev-dependencies]

html5ever/examples/html2html.rs

@@ -15,18 +15,17 @@
 //!
 //! where htmlparser-1.4.jar comes from http://about.validator.nu/htmlparser/
 
-extern crate tendril;
 extern crate html5ever;
 
 use std::io::{self, Write};
 use std::default::Default;
 
-use tendril::TendrilSink;
 
-use html5ever::driver::ParseOpts;
-use html5ever::tree_builder::TreeBuilderOpts;
 use html5ever::{parse_document, serialize};
+use html5ever::driver::ParseOpts;
 use html5ever::rcdom::RcDom;
+use html5ever::tendril::TendrilSink;
+use html5ever::tree_builder::TreeBuilderOpts;
 
 fn main() {
     let opts = ParseOpts {

html5ever/examples/print-rcdom.rs

@@ -8,16 +8,15 @@
 // except according to those terms.
 
 #[macro_use] extern crate html5ever;
-extern crate tendril;
 
 use std::io;
 use std::iter::repeat;
 use std::default::Default;
 use std::string::String;
 
-use tendril::TendrilSink;
 use html5ever::parse_document;
 use html5ever::rcdom::{NodeData, RcDom, Handle};
+use html5ever::tendril::TendrilSink;
 
 // This is not proper HTML serialization, of course.
 

html5ever/src/lib.rs

@@ -34,11 +34,5 @@ pub mod tokenizer;
 pub mod tree_builder;
 pub mod driver;
 
-/// Re-export the tendril crate.
-pub mod tendril {
-    extern crate tendril;
-    pub use self::tendril::*;
-}
-
 /// Re-export the encoding crate.
 pub use tendril::encoding;

html5ever/tests/serializer.rs

@@ -7,15 +7,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate tendril;
 #[macro_use] extern crate html5ever;
 
 use std::default::Default;
-use tendril::{StrTendril, SliceExt, TendrilSink};
 
-use html5ever::driver::ParseOpts;
 use html5ever::{parse_fragment, parse_document, serialize, QualName};
+use html5ever::driver::ParseOpts;
 use html5ever::rcdom::RcDom;
+use html5ever::tendril::{StrTendril, SliceExt, TendrilSink};
 
 fn parse_and_serialize(input: StrTendril) -> StrTendril {
     let dom = parse_fragment(

html5ever/tests/tree_builder.rs

@@ -8,7 +8,6 @@
 // except according to those terms.
 
 extern crate test;
-extern crate tendril;
 #[macro_use] extern crate html5ever;
 
 mod foreach_html5lib_test;
@@ -28,8 +27,8 @@ use test::ShouldPanic::No;
 use html5ever::{LocalName, QualName};
 use html5ever::{ParseOpts, parse_document, parse_fragment};
 use html5ever::rcdom::{NodeData, Handle, RcDom};
+use html5ever::tendril::{StrTendril, TendrilSink};
 
-use tendril::{StrTendril, TendrilSink};
 
 fn parse_tests<It: Iterator<Item=String>>(mut lines: It) -> Vec<HashMap<String, String>> {
     let mut tests = vec!();

markup5ever/Cargo.toml

@@ -13,6 +13,7 @@ path = "lib.rs"
 
 [features]
 heap_size = ["heapsize", "heapsize_derive", "string_cache/heapsize"]
+unstable = ["tendril/unstable"]
 
 [dependencies]
 string_cache = "0.5"

markup5ever/lib.rs

@@ -12,7 +12,7 @@
 #[cfg(feature = "heap_size")] extern crate heapsize;
 extern crate string_cache;
 extern crate phf;
-extern crate tendril;
+pub extern crate tendril;
 
 #[macro_export]
 macro_rules! small_char_set ( ($($e:expr)+) => (

xml5ever/Cargo.toml

@@ -19,13 +19,12 @@ name = "xml5ever"
 doctest = true
 
 [features]
-unstable = ["tendril/unstable"]
+unstable = ["markup5ever/unstable"]
 
 [dependencies]
 time = "0.1"
 log = "0.3"
 mac = "0.1"
-tendril = "0.2"
 markup5ever = {version = "0.1", path = "../markup5ever" }
 
 [dev-dependencies]

xml5ever/src/lib.rs

@@ -39,12 +39,6 @@ extern crate time;
 
 pub use markup5ever::*;
 
-/// Re-export the tendril crate so that users don’t need to depend on it.
-pub mod tendril {
-    extern crate tendril;
-    pub use self::tendril::*;
-}
-
 macro_rules! time {
     ($e:expr) => {{
         let t0 = ::time::precise_time_ns();