servo · bors-servo · May 2, 2017 · Apr 13, 2017 · Apr 17, 2017 · Apr 13, 2017
diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "html5lib-tests"]
-	path = html5lib-tests
+	path = html5ever/html5lib-tests
 	url = https://github.com/html5lib/html5lib-tests
 [submodule "xml5lib-tests"]
 	path = xml5ever/xml5lib-tests

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,4 +1,4 @@
-This project is copyright 2014, The html5ever Project Developers (given in
+This project is Copyright 2014-2017 , The html5ever Project Developers (given in
 the file AUTHORS).
 
 Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,57 +1,9 @@
-[package]
-
-name = "html5ever"
-version = "0.15.0"
-authors = [ "The html5ever Project Developers" ]
-license = "MIT / Apache-2.0"
-repository = "https://github.com/servo/html5ever"
-description = "High-performance browser-grade HTML5 parser"
-documentation = "https://docs.rs/html5ever"
-build = "build.rs"
-
-[lib]
-name = "html5ever"
-
-# https://github.com/rust-lang/cargo/issues/1512
-doctest = false
-
-[[test]]
-name = "tree_builder"
-harness = false
-
-[[test]]
-name = "tokenizer"
-harness = false
-
-[[test]]
-name = "serializer"
-
-[[bench]]
-name = "tokenizer"
-harness = false
-
-[features]
-unstable = ["tendril/unstable"]
-heap_size = ["heapsize", "heapsize_derive", "html5ever-atoms/heap_size"]
-
-[dependencies]
-log = "0"
-phf = "0.7"
-mac = "0"
-tendril = "0.2.2"
-heapsize = { version = "0.3", optional = true }
-heapsize_derive = { version = "0.1", optional = true }
-html5ever-atoms = { version = "0.3", path = "./atoms" }
-
-[dev-dependencies]
-rustc-serialize = "0.3.15"
-rustc-test = "0.1.3"
-
-[build-dependencies]
-phf_codegen = "0.7.3"
-quote = "0.3.3"
-rustc-serialize = "0.3.15"
-syn = { version = "0.11", features = ["full", "visit"] }
+[workspace]
+members = [
+    "markup5ever",
+    "html5ever",
+    "xml5ever"
+]
 
 [profile.dev]
 debug = false

diff --git a/atoms/lib.rs b/atoms/lib.rs
diff --git a/build.rs b/build.rs
diff --git a/html5ever/Cargo.toml b/html5ever/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+
+name = "html5ever"
+version = "0.16.0"
+authors = [ "The html5ever Project Developers" ]
+license = "MIT / Apache-2.0"
+repository = "https://github.com/servo/html5ever"
+description = "High-performance browser-grade HTML5 parser"
+documentation = "https://docs.rs/html5ever"
+build = "build.rs"
+
+[lib]
+name = "html5ever"
+
+doctest = true
+
+[[test]]
+name = "tree_builder"
+harness = false
+
+[[test]]
+name = "tokenizer"
+harness = false
+
+[[test]]
+name = "serializer"
+
+[[bench]]
+name = "tokenizer"
+harness = false
+
+[features]
+unstable = ["tendril/unstable"]
+heap_size = ["markup5ever/heap_size"]
+
+[dependencies]
+log = "0"
+mac = "0"
+tendril = "0.2.2"
+markup5ever = { version = "0.1", path = "../markup5ever" }
+
+[dev-dependencies]
+rustc-serialize = "0.3.15"
+rustc-test = "0.1.3"
+
+[build-dependencies]
+quote = "0.3.3"
+syn = { version = "0.11", features = ["full", "visit"] }
diff --git a/benches/tokenizer.rs → html5ever/benches/tokenizer.rs b/benches/tokenizer.rs → html5ever/benches/tokenizer.rs
@@ -1,4 +1,4 @@
-// Copyright 2014 The html5ever Project Developers. See the
+// Copyright 2014-2017  The html5ever Project Developers. See the
 // COPYRIGHT file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -8,7 +8,6 @@
 // except according to those terms.
 
 extern crate test;
-extern crate tendril;
 extern crate html5ever;
 
 use std::{fs, env, cmp};
@@ -19,9 +18,8 @@ use test::{black_box, Bencher, TestDesc, TestDescAndFn};
 use test::{DynTestName, DynBenchFn, TDynBenchFn};
 use test::ShouldPanic::No;
 
-use tendril::{ByteTendril, StrTendril, ReadExt, SliceExt};
-use html5ever::tokenizer::{TokenSink, Token, Tokenizer, TokenizerOpts, TokenSinkResult};
-use html5ever::tokenizer::buffer_queue::BufferQueue;
+use html5ever::tokenizer::{BufferQueue, TokenSink, Token, Tokenizer, TokenizerOpts, TokenSinkResult};
+use html5ever::tendril::*;
 
 struct Sink;
 

diff --git a/html5ever/build.rs b/html5ever/build.rs
@@ -0,0 +1,28 @@
+// Copyright 2014-2017  The html5ever Project Developers. See the
+// COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use] extern crate quote;
+extern crate syn;
+
+use std::env;
+use std::path::Path;
+
+#[path = "macros/match_token.rs"]
+mod match_token;
+
+fn main() {
+    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+
+    let rules_rs = Path::new(&manifest_dir).join("src/tree_builder/rules.rs");
+    match_token::expand_match_tokens(
+        &rules_rs,
+        &Path::new(&env::var("OUT_DIR").unwrap()).join("rules.rs"));
+
+    println!("cargo:rerun-if-changed={}", rules_rs.display());
+}
diff --git a/data/bench/lipsum-zh.html → html5ever/data/bench/lipsum-zh.html b/data/bench/lipsum-zh.html → html5ever/data/bench/lipsum-zh.html
diff --git a/data/bench/lipsum.html → html5ever/data/bench/lipsum.html b/data/bench/lipsum.html → html5ever/data/bench/lipsum.html
diff --git a/data/bench/medium-fragment.html → html5ever/data/bench/medium-fragment.html b/data/bench/medium-fragment.html → html5ever/data/bench/medium-fragment.html
diff --git a/data/bench/small-fragment.html → html5ever/data/bench/small-fragment.html b/data/bench/small-fragment.html → html5ever/data/bench/small-fragment.html
diff --git a/data/bench/strong.html → html5ever/data/bench/strong.html b/data/bench/strong.html → html5ever/data/bench/strong.html
diff --git a/data/bench/tiny-fragment.html → html5ever/data/bench/tiny-fragment.html b/data/bench/tiny-fragment.html → html5ever/data/bench/tiny-fragment.html
diff --git a/data/test/ignore → html5ever/data/test/ignore b/data/test/ignore → html5ever/data/test/ignore
diff --git a/examples/capi/tokenize.c → html5ever/examples/capi/tokenize.c b/examples/capi/tokenize.c → html5ever/examples/capi/tokenize.c
@@ -1,4 +1,4 @@
-// Copyright 2014 The html5ever Project Developers. See the
+// Copyright 2014-2017 The html5ever Project Developers. See the
 // COPYRIGHT file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or

diff --git a/examples/html2html.rs → html5ever/examples/html2html.rs b/examples/html2html.rs → html5ever/examples/html2html.rs
@@ -1,4 +1,4 @@
-// Copyright 2014 The html5ever Project Developers. See the
+// Copyright 2014-2017 The html5ever Project Developers. See the
 // COPYRIGHT file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or

diff --git a/examples/noop-tokenize.rs → html5ever/examples/noop-tokenize.rs b/examples/noop-tokenize.rs → html5ever/examples/noop-tokenize.rs
@@ -1,4 +1,4 @@
-// Copyright 2014 The html5ever Project Developers. See the
+// Copyright 2014-2017 The html5ever Project Developers. See the
 // COPYRIGHT file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -10,15 +10,12 @@
 // Run a single benchmark once.  For use with profiling tools.
 
 extern crate html5ever;
-extern crate tendril;
 
 use std::io;
 use std::default::Default;
 
-use tendril::{ByteTendril, ReadExt};
-
-use html5ever::tokenizer::{TokenSinkResult, TokenSink, Token, Tokenizer};
-use html5ever::tokenizer::buffer_queue::BufferQueue;
+use html5ever::tokenizer::{BufferQueue, TokenSinkResult, TokenSink, Token, Tokenizer};
+use html5ever::tendril::*;
 
 struct Sink(Vec<Token>);