Merge pull request #45 from Manishearth/internedstring

InternedString.get() removal; brings us to rustc 1.0.0-dev (80627cd3c 2015-02-07 12:01:31 +0000)
rust-phf · Feb 7, 2015 · 9b9c009 · 9b9c009
2 parents b0c5e3c + 3150bf0
commit 9b9c009
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/phf_macros/src/util.rs b/phf_macros/src/util.rs
@@ -36,7 +36,7 @@ pub enum Key {
 impl<S> Hash<S> for Key where S: Hasher + hash::Writer {
     fn hash(&self, state: &mut S) {
         match *self {
-            Key::Str(ref s) => s.get().hash(state),
+            Key::Str(ref s) => s.hash(state),
             Key::Binary(ref b) => b.hash(state),
             Key::Char(c) => c.hash(state),
             Key::U8(b) => b.hash(state),
@@ -55,7 +55,7 @@ impl<S> Hash<S> for Key where S: Hasher + hash::Writer {
 impl PhfHash for Key {
     fn phf_hash(&self, key: u64) -> (u32, u32, u32) {
         match *self {
-            Key::Str(ref s) => s.get().phf_hash(key),
+            Key::Str(ref s) => s.phf_hash(key),
             Key::Binary(ref b) => b.phf_hash(key),
             Key::Char(c) => c.phf_hash(key),
             Key::U8(b) => b.phf_hash(key),