Tweaks

samestep · Dec 10, 2024 · b588b57 · b588b57
1 parent fa2e8f2
commit b588b57
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/day04/mod.rs b/src/day04/mod.rs
@@ -14,16 +14,16 @@ impl<'a> Grid<'a> {
     }
 
     fn height(&self) -> usize {
-        self.string.len() / (self.width + 1)
+        self.string.len() / (self.width() + 1)
     }
 
     fn get(&self, x: isize, y: isize) -> Option<&str> {
         let i: usize = y.try_into().ok()?;
         let j: usize = x.try_into().ok()?;
-        if j >= self.width {
+        if j >= self.width() {
             return None;
         }
-        let k = i * (self.width + 1) + j;
+        let k = i * (self.width() + 1) + j;
         self.string.get(k..k + 1)
     }
 

diff --git a/src/day06/mod.rs b/src/day06/mod.rs
@@ -24,7 +24,7 @@ impl<'a> Grid<'a> {
     }
 
     fn height(&self) -> usize {
-        self.string.len() / (self.width + 1)
+        self.string.len() / (self.width() + 1)
     }
 
     fn start(&self) -> (isize, isize) {
@@ -34,10 +34,10 @@ impl<'a> Grid<'a> {
     fn get(&self, x: isize, y: isize) -> Option<&str> {
         let i: usize = y.try_into().ok()?;
         let j: usize = x.try_into().ok()?;
-        if j >= self.width {
+        if j >= self.width() {
             return None;
         }
-        let k = i * (self.width + 1) + j;
+        let k = i * (self.width() + 1) + j;
         self.string.get(k..k + 1)
     }
 }

diff --git a/src/day08/mod.rs b/src/day08/mod.rs
@@ -18,16 +18,16 @@ impl<'a> Grid<'a> {
     }
 
     fn height(&self) -> usize {
-        self.string.len() / (self.width + 1)
+        self.string.len() / (self.width() + 1)
     }
 
     fn get(&self, x: isize, y: isize) -> Option<&str> {
         let i: usize = y.try_into().ok()?;
         let j: usize = x.try_into().ok()?;
-        if j >= self.width {
+        if j >= self.width() {
             return None;
         }
-        let k = i * (self.width + 1) + j;
+        let k = i * (self.width() + 1) + j;
         self.string.get(k..k + 1)
     }
 }