Fix Hash for EndianReader (gimli-rs#723)

philipc · web-flow · commit 9810fdd84724 · 2024-06-28T17:06:32.000+10:00
Since we have a manual PartialEq implementation, we need a
matching manual Hash implementation.
diff --git a/src/read/endian_reader.rs b/src/read/endian_reader.rs
@@ -5,6 +5,7 @@ use alloc::rc::Rc;
 use alloc::string::String;
 use alloc::sync::Arc;
 use core::fmt::Debug;
+use core::hash::{Hash, Hasher};
 use core::ops::{Deref, Index, Range, RangeFrom, RangeTo};
 use core::slice;
 use core::str;
@@ -116,7 +117,7 @@ pub type EndianArcSlice<Endian> = EndianReader<Endian, Arc<[u8]>>;
 /// pub type MmapFileReader<Endian> = gimli::EndianReader<Endian, ArcMmapFile>;
 /// # fn test(_: &MmapFileReader<gimli::NativeEndian>) { }
 /// ```
-#[derive(Debug, Clone, Copy, Hash)]
+#[derive(Debug, Clone, Copy)]
 pub struct EndianReader<Endian, T>
 where
     Endian: Endianity,
@@ -144,6 +145,17 @@ where
 {
 }
 
+impl<Endian, T> Hash for EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        // This must match the `PartialEq` implementation.
+        self.bytes().hash(state);
+    }
+}
+
 // This is separated out from `EndianReader` so that we can avoid running afoul
 // of borrowck. We need to `read_slice(&mut self, ...) -> &[u8]` and then call
 // `self.endian.read_whatever` on the result. The problem is that the returned
