Fix clippy warnings and cleanup code

Author: marcdejonge

2021/src/bin/day1.rs

@@ -2,10 +2,12 @@
 
 use advent_lib::{day_main, day_test};
 
+#[allow(clippy::ptr_arg)]
 fn calculate_part1(input: &Vec<u32>) -> usize {
     input.windows(2).filter(|w| w[1] > w[0]).count()
 }
 
+#[allow(clippy::ptr_arg)]
 fn calculate_part2(input: &Vec<u32>) -> usize {
     input
         .windows(3)

2021/src/bin/day2.rs

@@ -1,5 +1,4 @@
 #![feature(test)]
-
 use advent_lib::{day_main, day_test};
 use nom_parse_macros::parse_from;
 
@@ -26,6 +25,7 @@ impl Position {
     }
 }
 
+#[allow(clippy::ptr_arg)]
 fn calculate_part1(commands: &Vec<Command>) -> i32 {
     commands
         .iter()
@@ -40,6 +40,7 @@ fn calculate_part1(commands: &Vec<Command>) -> i32 {
         .get_result()
 }
 
+#[allow(clippy::ptr_arg)]
 fn calculate_part2(commands: &Vec<Command>) -> i32 {
     commands
         .iter()

2021/src/bin/day3.rs

@@ -32,7 +32,7 @@ impl<'a> ParseFrom<&'a [u8]> for Input {
     }
 }
 
-fn has_majority_ones(numbers: &Vec<u32>, mask: u32) -> bool {
+fn has_majority_ones(numbers: &[u32], mask: u32) -> bool {
     numbers.iter().filter(|&&nr| (nr & mask) != 0).count() * 2 >= numbers.len()
 }
 

2021/src/bin/day4.rs

@@ -28,7 +28,7 @@ impl Board {
                 }
             }
         }
-        return None;
+        None
     }
 
     fn has_bingo(&self, row: usize, col: usize) -> bool {

2021/src/bin/day5.rs

@@ -1,7 +1,7 @@
 #![feature(test)]
 
 use advent_lib::{
-    geometry::{vector2, Point, Vector},
+    geometry::{Point, Vector},
     grid::Grid,
     lines::LineSegment,
     *,
@@ -31,37 +31,44 @@ impl Iterator for LineIterator {
 
 fn iter(line: &Line) -> LineIterator {
     LineIterator {
-        line: line.clone(),
-        next: Some(line.start.clone()),
-        step: {
-            let direction = line.end - line.start;
-            vector2(direction.x().signum(), direction.y().signum())
-        },
+        line: *line,
+        next: Some(line.start),
+        step: (line.end - line.start).signum(),
     }
 }
 
 fn is_horizontal_or_vertical(line: &Line) -> bool {
     line.start.x() == line.end.x() || line.start.y() == line.end.y()
 }
 
+fn write_line_to(grid: &mut Grid<u8>, line: &LineSegment<2, i32>) {
+    for point in iter(line) {
+        if let Some(e) = grid.get_mut(point) {
+            *e += 1;
+        }
+    }
+}
+
 fn calculate_part1(input: &Vec<Line>) -> u64 {
-    let mut grid = Grid::<u8>::new_empty(1000, 1000);
+    let mut grid = Grid::<u8>::new_empty(
+        input.iter().map(|l| l.max_x()).max().unwrap() + 1,
+        input.iter().map(|l| l.max_y()).max().unwrap() + 1,
+    );
     for line in input {
         if is_horizontal_or_vertical(line) {
-            for point in iter(line) {
-                grid.get_mut(point).map(|e| *e += 1);
-            }
+            write_line_to(&mut grid, line);
         }
     }
     grid.entries().filter(|(_, &value)| value >= 2).count() as u64
 }
 
 fn calculate_part2(input: &Vec<Line>) -> u64 {
-    let mut grid = Grid::<u8>::new_empty(1000, 1000);
+    let mut grid = Grid::<u8>::new_empty(
+        input.iter().map(|l| l.max_x()).max().unwrap() + 1,
+        input.iter().map(|l| l.max_y()).max().unwrap() + 1,
+    );
     for line in input {
-        for point in iter(line) {
-            grid.get_mut(point).map(|e| *e += 1);
-        }
+        write_line_to(&mut grid, line);
     }
     grid.entries().filter(|(_, &value)| value >= 2).count() as u64
 }

shared/src/geometry.rs

@@ -81,6 +81,19 @@ pub struct Vector<const D: usize, T> {
     pub coords: [T; D],
 }
 
+macro_rules! number_ops {
+    () => {};
+    ($type:tt $($types:tt )*) => {
+        impl<const D: usize> Vector<D, $type> {
+            pub fn abs(self) -> Self { Self { coords: self.coords.map(|nr| nr.abs()) } }
+            pub fn signum(self) -> Self { Self { coords: self.coords.map(|nr| nr.signum()) } }
+        }
+        number_ops!($($types )*);
+    };
+}
+
+number_ops!(i8 i16 i32 i64);
+
 impl<I, E, const D: usize, T> ParseFrom<I, E> for Vector<D, T>
 where
     T: Default + Copy + ParseFrom<I, E>,

shared/src/iter_utils.rs

@@ -21,9 +21,9 @@ pub trait IteratorUtils: Iterator {
         Self::Item: Default + Copy,
     {
         let mut window: [Self::Item; D] = [Default::default(); D];
-        for ix in 1..D {
+        for e in &mut window[1..] {
             if let Some(value) = self.next() {
-                window[ix] = value;
+                *e = value;
             } else {
                 break;
             }