feat: accept &(usize, usize) as Matrix index

This comes in addition to `(usize, usize)`.
evenfurther · Dec 29, 2024 · e2fb157 · e2fb157
1 parent 0f5bdd3
commit e2fb157
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/matrix.rs b/src/matrix.rs
@@ -787,13 +787,28 @@ impl<C> Index<(usize, usize)> for Matrix<C> {
     }
 }
 
+impl<C> Index<&(usize, usize)> for Matrix<C> {
+    type Output = C;
+
+    #[must_use]
+    fn index(&self, index: &(usize, usize)) -> &C {
+        &self[*index]
+    }
+}
+
 impl<C> IndexMut<(usize, usize)> for Matrix<C> {
     fn index_mut(&mut self, index: (usize, usize)) -> &mut C {
         let i = self.idx(index);
         &mut self.data[i]
     }
 }
 
+impl<C> IndexMut<&(usize, usize)> for Matrix<C> {
+    fn index_mut(&mut self, index: &(usize, usize)) -> &mut C {
+        &mut self[*index]
+    }
+}
+
 impl<C> Deref for Matrix<C> {
     type Target = [C];
 

diff --git a/tests/matrix.rs b/tests/matrix.rs
@@ -24,6 +24,25 @@ fn sm() {
     assert_eq!(m[(1, 1)], 33);
 }
 
+#[test]
+fn index_as_ref() {
+    let mut m = Matrix::new(2, 2, 0usize);
+    m[&(0, 0)] = 0;
+    m[&(0, 1)] = 1;
+    m[&(1, 0)] = 10;
+    m[&(1, 1)] = 11;
+    m[&(0, 1)] = 2;
+    assert_eq!(m[&(0, 0)], 0);
+    assert_eq!(m[&(0, 1)], 2);
+    assert_eq!(m[&(1, 0)], 10);
+    assert_eq!(m[&(1, 1)], 11);
+    m.fill(33);
+    assert_eq!(m[&(0, 0)], 33);
+    assert_eq!(m[&(0, 1)], 33);
+    assert_eq!(m[&(1, 0)], 33);
+    assert_eq!(m[&(1, 1)], 33);
+}
+
 #[test]
 fn from_fn() {
     let m = Matrix::from_fn(2, 3, |(row, column)| 10 * row + column);