Format code

day_04/src/crossword.rs

@@ -4,8 +4,6 @@ use std::fs::File;
 use std::io::{BufReader, prelude::*};
 use std::num;
 
-
-
 #[derive(Debug)]
 pub struct Crossword {
     data: Vec<Vec<char>>,
@@ -25,8 +23,8 @@ impl<'a> WordPuller<'a> {
         let mut word = String::new();
 
         for i in 0..num_of_letters {
-            let x= self.x as isize + (i as isize * self.direction.0);
-            let y= self.y as isize + (i as isize * self.direction.1);
+            let x = self.x as isize + (i as isize * self.direction.0);
+            let y = self.y as isize + (i as isize * self.direction.1);
             word.push(self.crossword.data[x as usize][y as usize]);
         }
 
@@ -69,14 +67,70 @@ impl Crossword {
         self.height
     }
 
-    pub fn n(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(-1, 0), crossword: self}}
-    pub fn ne(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(-1, 1), crossword: self}}
-    pub fn e(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(0, 1), crossword: self}}
-    pub fn se(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(1, 1), crossword: self}}
-    pub fn s(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(1, 0), crossword: self}}
-    pub fn sw(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(1, -1), crossword: self}}
-    pub fn w(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(0, -1), crossword: self}}
-    pub fn nw(&self, x: usize, y: usize) -> WordPuller { WordPuller {x, y, direction:(-1, -1), crossword: self}}
+    pub fn n(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (-1, 0),
+            crossword: self,
+        }
+    }
+    pub fn ne(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (-1, 1),
+            crossword: self,
+        }
+    }
+    pub fn e(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (0, 1),
+            crossword: self,
+        }
+    }
+    pub fn se(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (1, 1),
+            crossword: self,
+        }
+    }
+    pub fn s(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (1, 0),
+            crossword: self,
+        }
+    }
+    pub fn sw(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (1, -1),
+            crossword: self,
+        }
+    }
+    pub fn w(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (0, -1),
+            crossword: self,
+        }
+    }
+    pub fn nw(&self, x: usize, y: usize) -> WordPuller {
+        WordPuller {
+            x,
+            y,
+            direction: (-1, -1),
+            crossword: self,
+        }
+    }
 }
 
 impl Display for Crossword {