Auto merge of #284 - servo:stable, r=nox

"unstable" Cargo features are now no-ops, to be removed.

servo/tendril#33

<!-- 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/284)
<!-- Reviewable:end -->

html5ever/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "html5ever"
-version = "0.18.0"
+version = "0.18.0"  # At next breaking change: also remove the "unstable" feature, now a no-op.
 authors = [ "The html5ever Project Developers" ]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"
@@ -30,7 +30,7 @@ name = "tokenizer"
 harness = false
 
 [features]
-unstable = ["markup5ever/unstable"]
+unstable = []
 heap_size = ["markup5ever/heap_size"]
 
 [dependencies]

markup5ever/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "markup5ever"
-version = "0.3.1"
+version = "0.3.1"  # At next breaking change: also remove the "unstable" feature, now a no-op; update tendril to 0.4
 authors = [ "The html5ever Project Developers" ]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"
@@ -13,12 +13,12 @@ path = "lib.rs"
 
 [features]
 heap_size = ["heapsize", "heapsize_derive", "string_cache/heapsize"]
-unstable = ["tendril/unstable"]
+unstable = []
 
 [dependencies]
 string_cache = "0.6"
 phf = "0.7"
-tendril = "0.3"
+tendril = "0.3.1"
 heapsize = { version = ">= 0.3, < 0.5", optional = true }
 heapsize_derive = { version = "0.1", optional = true }
 

scripts/travis-build.sh

@@ -13,9 +13,8 @@ set -ex
 if [ $TRAVIS_RUST_VERSION = nightly ]
 then
     cargo test -p html5ever --features "rustc-test/capture" --bench tokenizer
-    cargo test -p html5ever --features "rustc-test/capture" 
-    cargo test -p html5ever --features "rustc-test/capture unstable" 
-    cargo test -p xml5ever --features "rustc-test/capture" 
+    cargo test -p html5ever --features "rustc-test/capture"
+    cargo test -p xml5ever --features "rustc-test/capture"
 else
     cargo test -p html5ever --bench tokenizer
     cargo test --all

xml5ever/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "xml5ever"
-version = "0.8.0"
+version = "0.8.0"  # At next breaking change: also remove the "unstable" feature, now a no-op.
 authors = ["The xml5ever project developers"]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"
@@ -19,7 +19,7 @@ name = "xml5ever"
 doctest = true
 
 [features]
-unstable = ["markup5ever/unstable"]
+unstable = []
 
 [dependencies]
 time = "0.1"

xml5ever/README.md

@@ -70,8 +70,8 @@ To build examples and tests you need to do something along the lines of:
 
 ```rust
     git submodule update --init # to fetch xml5lib-tests
-    cargo build --features unstable
-    cargo test --features unstable
+    cargo build
+    cargo test
 ```
 
 This will fetch tests from outside repository and it will invoke cargo to

xml5ever/tests/tree_builder.rs

@@ -7,8 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![cfg_attr(feature = "unstable", feature(start, test))]
-
 extern crate rustc_serialize;
 extern crate test;
 #[macro_use] extern crate xml5ever;