Update phf to 0.8

Author: nox

Cargo.toml

@@ -25,7 +25,7 @@ unstable = []
 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"}
 

src/atom.rs

@@ -324,8 +324,8 @@ impl<'a, Static: StaticAtomSet> From<Cow<'a, str>> for Atom<Static> {
     #[inline]
     fn from(string_to_add: Cow<'a, str>) -> Self {
         let static_set = Static::get();
-        let hash = phf_shared::hash(&*string_to_add, static_set.key);
-        let index = phf_shared::get_index(hash, static_set.disps, static_set.atoms.len());
+        let hash = phf_shared::hash(&*string_to_add, &static_set.key);
+        let index = phf_shared::get_index(&hash, static_set.disps, static_set.atoms.len());
 
         let unpacked = if static_set.atoms[index as usize] == string_to_add {
             Static(index)
@@ -336,6 +336,7 @@ impl<'a, Static: StaticAtomSet> From<Cow<'a, str>> for Atom<Static> {
                 buf[..len].copy_from_slice(string_to_add.as_bytes());
                 Inline(len as u8, buf)
             } else {
+                let hash = (hash.g as u64) << 32 | (hash.f1 as u64);
                 Dynamic(STRING_CACHE.lock().unwrap().add(string_to_add, hash) as *mut ())
             }
         };

string-cache-codegen/Cargo.toml

@@ -14,7 +14,7 @@ path = "lib.rs"
 
 [dependencies]
 string_cache_shared = {path = "../shared", version = "0.3"}
-phf_generator = "0.7.22"
-phf_shared = "0.7.4"
+phf_generator = "0.8"
+phf_shared = "0.8"
 proc-macro2 = "1"
 quote = "1"

string-cache-codegen/lib.rs

@@ -203,8 +203,8 @@ impl AtomType {
 
         let hashes: Vec<u32> =
             atoms.iter().map(|string| {
-                let hash = phf_shared::hash(string, key);
-                ((hash >> 32) ^ hash) as u32
+                let hash = phf_shared::hash(string, &key);
+                (hash.g ^ hash.f1) as u32
             }).collect();
 
         let type_name = if let Some(position) = self.path.rfind("::") {