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

Update phf and make a bunch of other breaking changes

Author: bors-servo

.travis.yml

@@ -9,10 +9,6 @@ os:
   - linux
 script:
   - cargo build
-  - cargo test
-  - cargo test --features log-events
-  - "if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --features unstable; fi"
-  - cargo test
-  - "cd string-cache-codegen/ && cargo build && cd .."
-  - "cd examples/event-log/ && cargo build && cd ../.."
-  - "cd examples/summarize-events/ && cargo build && cd ../.."
+  - cargo test --all
+  - "cd string-cache-codegen && cargo build && cd .."
+  - "if [ $TRAVIS_RUST_VERSION = nightly ]; then cd integration-tests && cargo test --features unstable && cd ..; fi"

Cargo.toml

@@ -1,13 +1,11 @@
 [package]
-
 name = "string_cache"
-version = "0.7.4"  # Also update README.md when making a semver-breaking change
+version = "0.8.0"  # Also update README.md when making a semver-breaking change
 authors = [ "The Servo Project Developers" ]
 description = "A string interning library for Rust, developed as part of the Servo project."
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/string-cache"
 documentation = "https://docs.rs/string_cache/"
-build = "build.rs"
 
 # Do not `exclude` ./string-cache-codegen because we want to include
 # ./string-cache-codegen/shared.rs, and `include` is a pain to use
@@ -18,30 +16,20 @@ build = "build.rs"
 [lib]
 name = "string_cache"
 
-[features]
-
-# Enable event logging for generating benchmark traces.
-# See examples/event-log.
-log-events = []
-
-# Use unstable features to optimize space and time (memory and CPU usage).
-unstable = []
-
 [dependencies]
 precomputed-hash = "0.1"
 lazy_static = "1"
 serde = "1"
-phf_shared = "0.7.4"
+phf_shared = "0.8"
 new_debug_unreachable = "1.0"
 string_cache_shared = {path = "./shared", version = "0.3"}
 
-[dev-dependencies]
-rand = "0.4"
-string_cache_codegen = { version = "0.4", path = "./string-cache-codegen" }
-
-[build-dependencies]
-string_cache_codegen = { version = "0.4", path = "./string-cache-codegen" }
-
 [[test]]
 name = "small-stack"
 harness = false
+
+[workspace]
+members = [
+    "string-cache-codegen",
+    "integration-tests",
+]

README.md

@@ -12,7 +12,7 @@ In `Cargo.toml`:
 
 ```toml
 [dependencies]
-string_cache = "0.7"
+string_cache = "0.8"
 ```
 
 In `lib.rs`:
@@ -31,10 +31,10 @@ In `Cargo.toml`:
 build = "build.rs"
 
 [dependencies]
-string_cache = "0.7"
+string_cache = "0.8"
 
 [build-dependencies]
-string_cache_codegen = "0.4"
+string_cache_codegen = "0.5"
 ```
 
 In `build.rs`:

examples/event-log/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "integration_tests"
+version = "0.0.1"
+authors = [ "The Servo Project Developers" ]
+build = "build.rs"
+publish = false
+
+[lib]
+doctest = false
+test = true
+
+[features]
+
+# Use unstable features to optimize space and time (memory and CPU usage).
+unstable = []
+
+[dependencies]
+string_cache = { version = "0.8", path = ".." }
+
+[dev-dependencies]
+rand = "0.7"
+string_cache_codegen = { version = "0.5", path = "../string-cache-codegen" }
+
+[build-dependencies]
+string_cache_codegen = { version = "0.5", path = "../string-cache-codegen" }

examples/event-log/README.md

@@ -4,7 +4,7 @@ use std::env;
 use std::path::Path;
 
 fn main() {
-    string_cache_codegen::AtomType::new("atom::tests::TestAtom", "test_atom!")
+    string_cache_codegen::AtomType::new("TestAtom", "test_atom!")
         .atoms(&[
             "a", "b", "address", "area", "body", "font-weight", "br", "html", "head", "id",
         ])