Auto merge of #396 - servo:phf, r=SimonSapin

bors-servo · web-flow · commit cf07a98bb090 · 2019-10-21T08:14:32.000-04:00
Update string_cache and phf
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/STRUCTURE.md b/STRUCTURE.md
diff --git a/html5ever/Cargo.toml b/html5ever/Cargo.toml
@@ -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"
@@ -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"
diff --git a/markup5ever/Cargo.toml b/markup5ever/Cargo.toml
@@ -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"
@@ -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"
diff --git a/markup5ever/build.rs b/markup5ever/build.rs
@@ -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();
 }
diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh
@@ -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
diff --git a/xml5ever/Cargo.toml b/xml5ever/Cargo.toml
@@ -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"
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,10 @@ fn named_entities_to_phf(from: &Path, to: &Path) {`
`142`	`142`	`"#`
`143`	`143`	`)`
`144`	`144`	`.unwrap();`
`145`		`- write!(`
	`145`	`+ writeln!(`
`146`	`146`	`&mut file,`
`147`		`- "pub static NAMED_ENTITIES: Map<&'static str, (u32, u32)> = "`
	`147`	`+ "pub static NAMED_ENTITIES: Map<&'static str, (u32, u32)> = {};",`
	`148`	`+ phf_map.build(),`
`148`	`149`	`)`
`149`	`150`	`.unwrap();`
`150`		`- phf_map.build(&mut file).unwrap();`
`151`		`- write!(&mut file, ";\n").unwrap();`
`152`	`151`	`}`