diff --git a/components/hashglobe/src/diagnostic.rs b/components/hashglobe/src/diagnostic.rs index e5cfebf5168..f761e31a6ab 100644 --- a/components/hashglobe/src/diagnostic.rs +++ b/components/hashglobe/src/diagnostic.rs @@ -62,21 +62,17 @@ impl DiagnosticHashMap let mut position = 0; let mut count = 0; let mut bad_canary = None; - - let mut iter = self.map.iter(); - while let Some((h, _, v)) = iter.next_with_hash() { + for (_,v) in self.map.iter() { let canary_ref = &v.0; position += 1; - if *canary_ref == CANARY { continue; } - count += 1; - bad_canary = Some((h, *canary_ref, canary_ref, position)); + bad_canary = Some((*canary_ref, canary_ref, position)); } if let Some(c) = bad_canary { - self.report_corruption(c.0, c.1, c.2, c.3, count); + self.report_corruption(c.0, c.1, c.2, count); } } @@ -162,7 +158,6 @@ impl DiagnosticHashMap #[inline(never)] fn report_corruption( &self, - hash: usize, canary: usize, canary_addr: *const usize, position: usize, @@ -177,14 +172,12 @@ impl DiagnosticHashMap value.as_ptr(), ); } - panic!( - concat!("HashMap Corruption (sz={}, cap={}, pairsz={}, hash={:#x}, cnry={:#x}, ", - "count={}, last_pos={}, base_addr={:?}, cnry_addr={:?}, jrnl_len={})"), + concat!("HashMap Corruption (sz={}, cap={}, pairsz={}, cnry={:#x}, count={}, ", + "last_pos={}, base_addr={:?}, cnry_addr={:?}, jrnl_len={})"), self.map.len(), self.map.raw_capacity(), ::std::mem::size_of::<(K, (usize, V))>(), - hash, canary, count, position, diff --git a/components/hashglobe/src/hash_map.rs b/components/hashglobe/src/hash_map.rs index e588b5b208c..e17f6fd6a8e 100644 --- a/components/hashglobe/src/hash_map.rs +++ b/components/hashglobe/src/hash_map.rs @@ -1339,12 +1339,6 @@ impl<'a, K: Debug, V: Debug> fmt::Debug for Iter<'a, K, V> { } } -impl<'a, K: 'a, V: 'a> Iter<'a, K, V> { - pub fn next_with_hash(&mut self) -> Option<(usize, &'a K, &'a V)> { - self.inner.next_with_hash() - } -} - /// A mutable iterator over the entries of a `HashMap`. /// /// This `struct` is created by the [`iter_mut`] method on [`HashMap`]. See its diff --git a/components/hashglobe/src/table.rs b/components/hashglobe/src/table.rs index 65542de4be2..adaf52ee54e 100644 --- a/components/hashglobe/src/table.rs +++ b/components/hashglobe/src/table.rs @@ -1130,15 +1130,6 @@ impl<'a, K, V> ExactSizeIterator for Iter<'a, K, V> { } } -impl<'a, K, V> Iter<'a, K, V> { - pub fn next_with_hash(&mut self) -> Option<(usize, &'a K, &'a V)> { - self.iter.next().map(|raw| unsafe { - let (hash_ptr, pair_ptr) = raw.hash_pair(); - (*hash_ptr, &(*pair_ptr).0, &(*pair_ptr).1) - }) - } -} - impl<'a, K, V> Iterator for IterMut<'a, K, V> { type Item = (&'a K, &'a mut V);