Auto merge of #185 - emilio:precomputed-hash, r=nox

Version bump.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/string-cache/185)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "string_cache"
-version = "0.4.0"  # Also update README.md when making a semver-breaking change
+version = "0.5.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"
@@ -22,7 +22,7 @@ name = "string_cache"
 
 # Enable event logging for generating benchmark traces.
 # See examples/event-log.
-log-events = ["rustc-serialize"]
+log-events = []
 
 # Use unstable features to optimize space and time (memory and CPU usage).
 unstable = []
@@ -33,12 +33,11 @@ lazy_static = "0.2"
 serde = "0.9"
 phf_shared = "0.7.4"
 debug_unreachable = "0.1.1"
-rustc-serialize = { version = "0.3", optional = true }
 heapsize = { version = "0.3", optional = true }
 string_cache_shared = {path = "./shared", version = "0.3"}
 
 [dev-dependencies]
 rand = "0.3"
 
 [build-dependencies]
-string_cache_codegen = { version = "0.3", path = "./string-cache-codegen" }
+string_cache_codegen = { version = "0.4", path = "./string-cache-codegen" }

README.md

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

src/event.rs

@@ -8,7 +8,6 @@
 // except according to those terms.
 
 use std::sync::Mutex;
-use rustc_serialize::{Encoder, Encodable};
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Debug)]
 pub enum Event {
@@ -27,29 +26,3 @@ pub fn log(e: Event) {
 }
 
 macro_rules! log (($e:expr) => (::event::log($e)));
-
-// Serialize by converting to this private struct,
-// which produces more convenient output.
-
-#[derive(RustcEncodable)]
-struct SerializeEvent<'a> {
-    event: &'static str,
-    id: u64,
-    string: Option<&'a String>,
-}
-
-impl Encodable for Event {
-    fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
-        let (event, id, string) = match *self {
-            Event::Intern(id) => ("intern", id, None),
-            Event::Insert(id, ref s) => ("insert", id, Some(s)),
-            Event::Remove(id) => ("remove", id, None),
-        };
-
-        SerializeEvent {
-            event: event,
-            id: id,
-            string: string
-        }.encode(s)
-    }
-}

src/lib.rs

@@ -14,7 +14,6 @@
 #![cfg_attr(all(test, feature = "unstable"), feature(test))]
 
 #[cfg(all(test, feature = "unstable"))] extern crate test;
-#[cfg(feature = "log-events")] extern crate rustc_serialize;
 #[cfg(feature = "heapsize")] extern crate heapsize;
 #[cfg(test)] extern crate rand;
 #[macro_use] extern crate lazy_static;

string-cache-codegen/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "string_cache_codegen"
-version = "0.3.1"  # 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 codegen library for string-cache, developed as part of the Servo project."
 license = "MIT / Apache-2.0"