Skip to content

Update string_cache and phf #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 21, 2019
Merged

Update string_cache and phf #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35a6448
Remove STRUCTURE.md
nox Oct 21, 2019
8027a6a
Update string_cache and phf
nox Oct 21, 2019
7f2561f
Work around a cargo limitation on nightly
nox Oct 21, 2019
e1e4be0
Explicitly test on 1.36.0
nox Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
branches:
except:
- servo

- servo
language: rust
rust:
- nightly
- beta
- stable
- nightly
- beta
- stable
- 1.36.0
script: scripts/travis-build.sh
25 changes: 0 additions & 25 deletions STRUCTURE.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions html5ever/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "html5ever"
version = "0.24.1"
version = "0.25.0"
authors = [ "The html5ever Project Developers" ]
license = "MIT / Apache-2.0"
repository = "https://github.com/servo/html5ever"
Expand Down Expand Up @@ -30,7 +30,7 @@ name = "serializer"
[dependencies]
log = "0.4"
mac = "0.1"
markup5ever = { version = "0.9", path = "../markup5ever" }
markup5ever = { version = "0.10", path = "../markup5ever" }

[dev-dependencies]
serde_json = "1.0"
Expand Down
10 changes: 5 additions & 5 deletions markup5ever/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "markup5ever"
version = "0.9.0"
version = "0.10.0"
authors = [ "The html5ever Project Developers" ]
license = "MIT / Apache-2.0"
repository = "https://github.com/servo/html5ever"
Expand All @@ -14,14 +14,14 @@ edition = "2018"
path = "lib.rs"

[dependencies]
string_cache = "0.7"
phf = "0.7"
string_cache = "0.8"
phf = "0.8"
tendril = "0.4"
log = "0.4"

[build-dependencies]
string_cache_codegen = "0.4"
phf_codegen = "0.7.3"
string_cache_codegen = "0.5.1"
phf_codegen = "0.8"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
Expand Down
7 changes: 3 additions & 4 deletions markup5ever/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,10 @@ fn named_entities_to_phf(from: &Path, to: &Path) {
"#
)
.unwrap();
write!(
writeln!(
&mut file,
"pub static NAMED_ENTITIES: Map<&'static str, (u32, u32)> = "
"pub static NAMED_ENTITIES: Map<&'static str, (u32, u32)> = {};",
phf_map.build(),
)
.unwrap();
phf_map.build(&mut file).unwrap();
write!(&mut file, ";\n").unwrap();
}
4 changes: 2 additions & 2 deletions scripts/travis-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ set -ex
if [ $TRAVIS_RUST_VERSION = nightly ]
then
cargo bench --all
cargo test -p html5ever --features "rustc-test/capture"
cargo test -p xml5ever --features "rustc-test/capture"
(cd html5ever && cargo test --features "rustc-test/capture")
(cd xml5ever && cargo test --features "rustc-test/capture")
else
cargo bench --all
cargo test --all
Expand Down
4 changes: 2 additions & 2 deletions xml5ever/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "xml5ever"
version = "0.15.0"
version = "0.16.0"
authors = ["The xml5ever project developers"]
license = "MIT / Apache-2.0"
repository = "https://github.com/servo/html5ever"
Expand All @@ -24,7 +24,7 @@ doctest = true
time = "0.1"
log = "0.4"
mac = "0.1"
markup5ever = {version = "0.9", path = "../markup5ever" }
markup5ever = {version = "0.10", path = "../markup5ever" }

[dev-dependencies]
serde_json = "1.0"
Expand Down