fix(utils): Derive Hash manually

har7an · har7an · commit 50d570d21325 · 2025-01-19T17:18:31.000+01:00
in `pane_size` since the `PartialEq` trait is also implemented manually. Previously the `Hash` impl wasn't consistent with the `Eq` impl, which can have weird effects when using these types in e.g. `HashMap`s or similar types. For additional information, see: - https://rust-lang.github.io/rust-clippy/master/index.html#derived_hash_with_manual_eq - https://doc.rust-lang.org/stable/std/hash/trait.Hash.html#hash-and-eq
diff --git a/zellij-utils/src/pane_size.rs b/zellij-utils/src/pane_size.rs
@@ -10,7 +10,7 @@ use crate::position::Position;
 
 /// Contains the position and size of a [`Pane`], or more generally of any terminal, measured
 /// in character rows and columns.
-#[derive(Clone, Copy, Default, Debug, Serialize, Deserialize, Hash)]
+#[derive(Clone, Copy, Default, Debug, Serialize, Deserialize)]
 pub struct PaneGeom {
     pub x: usize,
     pub y: usize,
@@ -24,6 +24,7 @@ pub struct PaneGeom {
 impl PartialEq for PaneGeom {
     fn eq(&self, other: &Self) -> bool {
         // compare all except is_pinned
+        // NOTE: Keep this in sync with what the `Hash` trait impl does.
         self.x == other.x
             && self.y == other.y
             && self.rows == other.rows
@@ -32,6 +33,17 @@ impl PartialEq for PaneGeom {
     }
 }
 
+impl std::hash::Hash for PaneGeom {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        // NOTE: Keep this in sync with what the `PartiqlEq` trait impl does.
+        self.x.hash(state);
+        self.y.hash(state);
+        self.rows.hash(state);
+        self.cols.hash(state);
+        self.is_stacked.hash(state);
+    }
+}
+
 impl Eq for PaneGeom {}
 
 #[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
