Skip to content

Commit abd8e22

Browse files
author
bors-servo
authored
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 -->
2 parents e2927cc + 32db910 commit abd8e22

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

html5ever/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "html5ever"
4-
version = "0.18.0"
4+
version = "0.18.0" # At next breaking change: also remove the "unstable" feature, now a no-op.
55
authors = [ "The html5ever Project Developers" ]
66
license = "MIT / Apache-2.0"
77
repository = "https://github.com/servo/html5ever"
@@ -30,7 +30,7 @@ name = "tokenizer"
3030
harness = false
3131

3232
[features]
33-
unstable = ["markup5ever/unstable"]
33+
unstable = []
3434
heap_size = ["markup5ever/heap_size"]
3535

3636
[dependencies]

markup5ever/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "markup5ever"
3-
version = "0.3.1"
3+
version = "0.3.1" # At next breaking change: also remove the "unstable" feature, now a no-op; update tendril to 0.4
44
authors = [ "The html5ever Project Developers" ]
55
license = "MIT / Apache-2.0"
66
repository = "https://github.com/servo/html5ever"
@@ -13,12 +13,12 @@ path = "lib.rs"
1313

1414
[features]
1515
heap_size = ["heapsize", "heapsize_derive", "string_cache/heapsize"]
16-
unstable = ["tendril/unstable"]
16+
unstable = []
1717

1818
[dependencies]
1919
string_cache = "0.6"
2020
phf = "0.7"
21-
tendril = "0.3"
21+
tendril = "0.3.1"
2222
heapsize = { version = ">= 0.3, < 0.5", optional = true }
2323
heapsize_derive = { version = "0.1", optional = true }
2424

scripts/travis-build.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ set -ex
1313
if [ $TRAVIS_RUST_VERSION = nightly ]
1414
then
1515
cargo test -p html5ever --features "rustc-test/capture" --bench tokenizer
16-
cargo test -p html5ever --features "rustc-test/capture"
17-
cargo test -p html5ever --features "rustc-test/capture unstable"
18-
cargo test -p xml5ever --features "rustc-test/capture"
16+
cargo test -p html5ever --features "rustc-test/capture"
17+
cargo test -p xml5ever --features "rustc-test/capture"
1918
else
2019
cargo test -p html5ever --bench tokenizer
2120
cargo test --all

xml5ever/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "xml5ever"
4-
version = "0.8.0"
4+
version = "0.8.0" # At next breaking change: also remove the "unstable" feature, now a no-op.
55
authors = ["The xml5ever project developers"]
66
license = "MIT / Apache-2.0"
77
repository = "https://github.com/servo/html5ever"
@@ -19,7 +19,7 @@ name = "xml5ever"
1919
doctest = true
2020

2121
[features]
22-
unstable = ["markup5ever/unstable"]
22+
unstable = []
2323

2424
[dependencies]
2525
time = "0.1"

xml5ever/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ To build examples and tests you need to do something along the lines of:
7070

7171
```rust
7272
git submodule update --init # to fetch xml5lib-tests
73-
cargo build --features unstable
74-
cargo test --features unstable
73+
cargo build
74+
cargo test
7575
```
7676

7777
This will fetch tests from outside repository and it will invoke cargo to

xml5ever/tests/tree_builder.rs

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// option. This file may not be copied, modified, or distributed
88
// except according to those terms.
99

10-
#![cfg_attr(feature = "unstable", feature(start, test))]
11-
1210
extern crate rustc_serialize;
1311
extern crate test;
1412
#[macro_use] extern crate xml5ever;

0 commit comments

Comments
 (0)