Auto merge of #268 - Ygg01:xhtml5ever, r=SimonSapin,Ygg01

Xhtml5ever

Ok, this is a large one.

Fixes #266, fixes #261, fixes #210.

It moves html5ever into separate folder, renames html5ever macros markup5ever and stores common code there.

Here is short summary of what I know is and isn't done.

- [x] Make every crate in the repo use a single workspace
- [x] Make sure Travis-CI is running every test
- [x] Rename the the html5ever_atoms crate to markup5ever and update html5ever and xml5ever to use it.
- [x] Increment version numbers
- [x] Make it so that users of either html5ever or xml5ever don’t need to have an explicit dependency to markup5ever
- [x] Export QualName #210
- [x] let markup5ever generate entities.json #261
- [ ] **Move TokenSink to markup5ever**
- [x] Move TreeSink to markup5ever
- [x] Move BufferQueue to markup5ever
- [x] Move SmallCharSet to markup5ever
- [ ] **Deal with driver.rs**

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/html5ever/268)
<!-- Reviewable:end -->

Author: bors-servo

.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

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

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

atoms/lib.rs

@@ -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"] }

build.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;
 

html5ever/Cargo.toml

@@ -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());
+}