servo · bors-servo · Jan 26, 2016 · Jan 25, 2016 · Jan 25, 2016 · Jan 25, 2016
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "html5ever"
-version = "0.2.11"
+version = "0.3.0"
 authors = [ "The html5ever Project Developers" ]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"
@@ -26,9 +26,10 @@ log = "0"
 phf = "0.7"
 string_cache = "0.2.0"
 mac = "0"
-tendril = "0.1.6"
+tendril = "0.2"
 heapsize = { version = "0.1.1", optional = true }
 heapsize_plugin = { version = "0.1.0", optional = true }
+hyper = {version = "0.7", optional = true}
 
 [dev-dependencies]
 rustc-serialize = "0.3.15"

diff --git a/build.rs b/build.rs
@@ -29,7 +29,9 @@ fn main() {
 
     named_entities_to_phf(
         &Path::new(&manifest_dir).join("data/entities.json"),
-        &Path::new(&env::var("OUT_DIR").unwrap()).join("named_entities.rs"))
+        &Path::new(&env::var("OUT_DIR").unwrap()).join("named_entities.rs"));
+
+    println!("cargo:rerun-if-changed={}", rules_rs.display());
 }
 
 #[cfg(feature = "codegen")]

diff --git a/capi/Cargo.toml b/capi/Cargo.toml
@@ -11,7 +11,6 @@ crate-type = ["staticlib"]
 [dependencies]
 libc = "0.2"
 string_cache = "0.2"
-tendril = "0.1.6"
 
 [dependencies.html5ever]
 path = "../"

diff --git a/capi/src/lib.rs b/capi/src/lib.rs
@@ -9,7 +9,6 @@
 
 extern crate libc;
 #[macro_use] extern crate string_cache;
-extern crate tendril;
 extern crate html5ever;
 
 use libc::c_int;

diff --git a/capi/src/tokenizer.rs b/capi/src/tokenizer.rs
@@ -11,6 +11,7 @@
 
 use c_bool;
 
+use html5ever::tendril::{StrTendril, SliceExt};
 use html5ever::tokenizer::{TokenSink, Token, Doctype, Tag, ParseError, DoctypeToken};
 use html5ever::tokenizer::{CommentToken, CharacterTokens, NullCharacterToken};
 use html5ever::tokenizer::{TagToken, StartTag, EndTag, EOFToken, Tokenizer};
@@ -20,7 +21,6 @@ use std::default::Default;
 
 use libc::{c_void, c_int, size_t};
 use string_cache::Atom;
-use tendril::{StrTendril, SliceExt};
 
 #[repr(C)]
 #[derive(Copy, Clone)]

diff --git a/examples/html2html.rs b/examples/html2html.rs
@@ -21,24 +21,26 @@ extern crate html5ever;
 use std::io::{self, Write};
 use std::default::Default;
 
-use tendril::{ByteTendril, ReadExt};
+use tendril::TendrilSink;
 
 use html5ever::driver::ParseOpts;
 use html5ever::tree_builder::TreeBuilderOpts;
-use html5ever::{parse, one_input, serialize};
+use html5ever::{parse_document, serialize};
 use html5ever::rcdom::RcDom;
 
 fn main() {
-    let mut input = ByteTendril::new();
-    io::stdin().read_to_tendril(&mut input).unwrap();
-    let input = input.try_reinterpret().unwrap();
-    let dom: RcDom = parse(one_input(input), ParseOpts {
+    let opts = ParseOpts {
         tree_builder: TreeBuilderOpts {
             drop_doctype: true,
             ..Default::default()
         },
         ..Default::default()
-    });
+    };
+    let stdin = io::stdin();
+    let dom = parse_document(RcDom::default(), opts)
+        .from_utf8()
+        .read_from(&mut stdin.lock())
+        .unwrap();
 
     // The validator.nu HTML2HTML always prints a doctype at the very beginning.
     io::stdout().write_all(b"<!DOCTYPE html>\n")

diff --git a/examples/noop-tokenize.rs b/examples/noop-tokenize.rs
@@ -17,8 +17,7 @@ use std::default::Default;
 
 use tendril::{ByteTendril, ReadExt};
 
-use html5ever::tokenizer::{TokenSink, Token};
-use html5ever::driver::{tokenize_to, one_input};
+use html5ever::tokenizer::{TokenSink, Token, Tokenizer};
 
 struct Sink(Vec<Token>);
 
@@ -35,5 +34,7 @@ fn main() {
     io::stdin().read_to_tendril(&mut input).unwrap();
     let input = input.try_reinterpret().unwrap();
 
-    tokenize_to(Sink(Vec::new()), one_input(input), Default::default());
+    let mut tok = Tokenizer::new(Sink(Vec::new()), Default::default());
+    tok.feed(input);
+    tok.end();
 }
diff --git a/examples/noop-tree-builder.rs b/examples/noop-tree-builder.rs
@@ -18,9 +18,9 @@ use std::collections::HashMap;
 use std::borrow::Cow;
 use string_cache::QualName;
 
-use tendril::{StrTendril, ByteTendril, ReadExt};
+use tendril::{StrTendril, TendrilSink};
 
-use html5ever::{parse_to, one_input};
+use html5ever::parse_document;
 use html5ever::tokenizer::Attribute;
 use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText};
 
@@ -39,6 +39,8 @@ impl Sink {
 
 impl TreeSink for Sink {
     type Handle = usize;
+    type Output = Self;
+    fn finish(self) -> Self { self }
 
     fn get_document(&mut self) -> usize {
         0
@@ -96,9 +98,9 @@ fn main() {
         next_id: 1,
         names: HashMap::new(),
     };
-
-    let mut input = ByteTendril::new();
-    io::stdin().read_to_tendril(&mut input).unwrap();
-    let input = input.try_reinterpret().unwrap();
-    parse_to(sink, one_input(input), Default::default());
+    let stdin = io::stdin();
+    parse_document(sink, Default::default())
+        .from_utf8()
+        .read_from(&mut stdin.lock())
+        .unwrap();
 }
diff --git a/examples/print-rcdom.rs b/examples/print-rcdom.rs
@@ -18,8 +18,8 @@ use std::iter::repeat;
 use std::default::Default;
 use std::string::String;
 
-use tendril::{ByteTendril, ReadExt};
-use html5ever::{parse, one_input};
+use tendril::TendrilSink;
+use html5ever::parse_document;
 use html5ever::rcdom::{Document, Doctype, Text, Comment, Element, RcDom, Handle};
 
 // This is not proper HTML serialization, of course.
@@ -63,10 +63,11 @@ pub fn escape_default(s: &str) -> String {
 }
 
 fn main() {
-    let mut input = ByteTendril::new();
-    io::stdin().read_to_tendril(&mut input).unwrap();
-    let input = input.try_reinterpret().unwrap();
-    let dom: RcDom = parse(one_input(input), Default::default());
+    let stdin = io::stdin();
+    let dom = parse_document(RcDom::default(), Default::default())
+        .from_utf8()
+        .read_from(&mut stdin.lock())
+        .unwrap();
     walk(0, dom.document);
 
     if !dom.errors.is_empty() {

diff --git a/examples/print-tree-actions.rs b/examples/print-tree-actions.rs
@@ -18,11 +18,11 @@ use std::collections::HashMap;
 use std::borrow::Cow;
 use string_cache::QualName;
 
-use tendril::{ByteTendril, StrTendril, ReadExt};
+use tendril::{StrTendril, TendrilSink};
 
-use html5ever::{parse_to, one_input};
 use html5ever::tokenizer::Attribute;
 use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText};
+use html5ever::parse_document;
 
 struct Sink {
     next_id: usize,
@@ -39,6 +39,8 @@ impl Sink {
 
 impl TreeSink for Sink {
     type Handle = usize;
+    type Output = Self;
+    fn finish(self) -> Self { self }
 
     fn parse_error(&mut self, msg: Cow<'static, str>) {
         println!("Parse error: {}", msg);
@@ -143,9 +145,9 @@ fn main() {
         next_id: 1,
         names: HashMap::new(),
     };
-
-    let mut input = ByteTendril::new();
-    io::stdin().read_to_tendril(&mut input).unwrap();
-    let input = input.try_reinterpret().unwrap();
-    parse_to(sink, one_input(input), Default::default());
+    let stdin = io::stdin();
+    parse_document(sink, Default::default())
+        .from_utf8()
+        .read_from(&mut stdin.lock())
+        .unwrap();
 }
diff --git a/examples/tokenize.rs b/examples/tokenize.rs
@@ -15,9 +15,8 @@ use std::default::Default;
 
 use tendril::{ByteTendril, ReadExt};
 
-use html5ever::tokenizer::{TokenSink, Token, TokenizerOpts, ParseError};
+use html5ever::tokenizer::{TokenSink, Tokenizer, Token, TokenizerOpts, ParseError};
 use html5ever::tokenizer::{CharacterTokens, NullCharacterToken, TagToken, StartTag, EndTag};
-use html5ever::driver::{tokenize_to, one_input};
 
 #[derive(Copy, Clone)]
 struct TokenPrinter {
@@ -84,9 +83,12 @@ fn main() {
     let mut input = ByteTendril::new();
     io::stdin().read_to_tendril(&mut input).unwrap();
     let input = input.try_reinterpret().unwrap();
-    tokenize_to(sink, one_input(input), TokenizerOpts {
+
+    let mut tok = Tokenizer::new(sink, TokenizerOpts {
         profile: true,
         .. Default::default()
     });
+    tok.feed(input);
+    tok.end();
     sink.is_char(false);
 }
diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh
@@ -10,6 +10,7 @@
 
 set -ex
 
+cargo build --features hyper
 # Test without unstable first, to make sure src/tree_builder/rules.expanded.rs is up-to-date.
 cargo test --no-run
 cargo test | ./scripts/shrink-test-output.py