From cf2302533faa11679b8ff6179d21c67c90506884 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 1 Feb 2017 14:56:13 +0100 Subject: [PATCH 1/6] Remove heap_size feature --- Cargo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ae233cd..c84a746 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,9 +27,6 @@ log-events = ["rustc-serialize"] # Use unstable features to optimize space and time (memory and CPU usage). unstable = [] -# HeapSizeOf support -heap_size = ["heapsize"] - [dependencies] lazy_static = "0.2" serde = "0.8" From 6db3edbe30c760d9c8d44b1fb6ea26f77a4e3259 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 16 Feb 2017 18:29:34 +0100 Subject: [PATCH 2/6] Silence a warning --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 6229344..b7961c3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,7 +15,7 @@ #[cfg(all(test, feature = "unstable"))] extern crate test; #[cfg(feature = "log-events")] extern crate rustc_serialize; -#[cfg(feature = "heapsize")] #[macro_use] extern crate heapsize; +#[cfg(feature = "heapsize")] extern crate heapsize; #[cfg(test)] extern crate rand; #[macro_use] extern crate lazy_static; #[macro_use] extern crate debug_unreachable; From 9e3c85c3ad3441629f88434ca1a290406a6bf797 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 1 Feb 2017 14:57:05 +0100 Subject: [PATCH 3/6] Remove Atom::with_str --- src/atom.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/atom.rs b/src/atom.rs index 1b12148..b03c5ac 100644 --- a/src/atom.rs +++ b/src/atom.rs @@ -228,11 +228,6 @@ impl Atom { pub fn get_hash(&self) -> u32 { ((self.unsafe_data >> 32) ^ self.unsafe_data) as u32 } - - pub fn with_str(&self, cb: F) -> Output - where F: FnOnce(&str) -> Output { - cb(self) - } } impl Default for Atom { From 1e5790b6a96b8b8c9aaed515a3d4b1abe6c51ebb Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 1 Feb 2017 14:58:53 +0100 Subject: [PATCH 4/6] Update serde to 0.9 --- Cargo.toml | 2 +- src/atom.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c84a746..94f8891 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ unstable = [] [dependencies] lazy_static = "0.2" -serde = "0.8" +serde = "0.9" phf_shared = "0.7.4" debug_unreachable = "0.1.1" rustc-serialize = { version = "0.3", optional = true } diff --git a/src/atom.rs b/src/atom.rs index b03c5ac..25e258c 100644 --- a/src/atom.rs +++ b/src/atom.rs @@ -426,16 +426,16 @@ impl AsRef for Atom { } impl Serialize for Atom { - fn serialize(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer { + fn serialize(&self, serializer: S) -> Result where S: Serializer { let string: &str = self.as_ref(); string.serialize(serializer) } } impl Deserialize for Atom { - fn deserialize(deserializer: &mut D) -> Result where D: Deserializer { + fn deserialize(deserializer: D) -> Result where D: Deserializer { let string: String = try!(Deserialize::deserialize(deserializer)); - Ok(Atom::from(&*string)) + Ok(Atom::from(string)) } } From c39ce5849ae75669a83432a6a0765af4ef7ff9e1 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 17 Feb 2017 00:52:33 +0100 Subject: [PATCH 5/6] Disable macOS builds Travis is backlogged into oblivion. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b7ee145..05ea9e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ rust: - stable os: - linux - - osx script: - cargo build - cargo test From 0ec0bfec9fe533250308ca6d4e9b1ec5a9f39906 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 1 Feb 2017 15:01:39 +0100 Subject: [PATCH 6/6] Bump version to 0.4.0 --- Cargo.toml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 94f8891..6bee177 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "string_cache" -version = "0.3.0" # Also update README.md when making a semver-breaking change +version = "0.4.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" diff --git a/README.md b/README.md index d244f69..43cf6fb 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ In `Cargo.toml`: ```toml [dependencies] -string_cache = "0.3" +string_cache = "0.4" ``` In `lib.rs`: @@ -31,7 +31,7 @@ In `Cargo.toml`: build = "build.rs" [dependencies] -string_cache = "0.3" +string_cache = "0.4" [build-dependencies] string_cache_codegen = "0.3"