Fix for weird type inference breakage

rust-phf · Jan 1, 2015 · 3c36bfb · 3c36bfb
1 parent 69d92b8
commit 3c36bfb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/phf/src/map.rs b/phf/src/map.rs
@@ -95,7 +95,8 @@ impl<K, V> Map<K, V> {
         let (d1, d2) = self.disps[(g % (self.disps.len() as u32)) as uint];
         let entry = &self.entries[(phf_shared::displace(f1, f2, d1, d2) % (self.entries.len() as u32))
                                   as uint];
-        if BorrowFrom::borrow_from(&entry.0) == key {
+        let b: &T = BorrowFrom::borrow_from(&entry.0);
+        if b == key {
             Some((&entry.0, &entry.1))
         } else {
             None

diff --git a/phf/src/ordered_map.rs b/phf/src/ordered_map.rs
@@ -114,7 +114,8 @@ impl<K, V> OrderedMap<K, V> {
         let idx = self.idxs[(phf_shared::displace(f1, f2, d1, d2) % (self.idxs.len() as u32)) as uint];
         let entry = &self.entries[idx];
 
-        if BorrowFrom::borrow_from(&entry.0) == key {
+        let b: &T = BorrowFrom::borrow_from(&entry.0);
+        if b == key {
             Some((idx, (&entry.0, &entry.1)))
         } else {
             None