clippy nursery 🍼

Author: rene-d

2024/aoc24/src/coord.rs

@@ -9,28 +9,28 @@ pub struct Coord {
 }
 
 impl Coord {
-    pub const LEFT: Coord = Coord { x: -1, y: 0 };
-    pub const RIGHT: Coord = Coord { x: 1, y: 0 };
-    pub const UP: Coord = Coord { x: 0, y: -1 };
-    pub const DOWN: Coord = Coord { x: 0, y: 1 };
+    pub const LEFT: Self = Self { x: -1, y: 0 };
+    pub const RIGHT: Self = Self { x: 1, y: 0 };
+    pub const UP: Self = Self { x: 0, y: -1 };
+    pub const DOWN: Self = Self { x: 0, y: 1 };
 }
 
 impl Coord {
     #[must_use]
-    pub fn new(x: i32, y: i32) -> Self {
+    pub const fn new(x: i32, y: i32) -> Self {
         Self { x, y }
     }
 
     #[must_use]
-    pub fn manhattan_distance(&self, rhs: &Coord) -> i32 {
+    pub const fn manhattan_distance(&self, rhs: &Self) -> i32 {
         (self.x - rhs.x).abs() + (self.y - rhs.y).abs()
     }
 }
 
 impl Add for Coord {
-    type Output = Coord;
-    fn add(self, rhs: Coord) -> Coord {
-        Coord {
+    type Output = Self;
+    fn add(self, rhs: Self) -> Self {
+        Self {
             x: self.x + rhs.x,
             y: self.y + rhs.y,
         }
@@ -45,9 +45,9 @@ impl AddAssign for Coord {
 }
 
 impl Sub for Coord {
-    type Output = Coord;
-    fn sub(self, rhs: Coord) -> Coord {
-        Coord {
+    type Output = Self;
+    fn sub(self, rhs: Self) -> Self {
+        Self {
             x: self.x - rhs.x,
             y: self.y - rhs.y,
         }
@@ -62,10 +62,10 @@ impl SubAssign for Coord {
 }
 
 impl Mul<i32> for Coord {
-    type Output = Coord;
+    type Output = Self;
 
-    fn mul(self, rhs: i32) -> Coord {
-        Coord {
+    fn mul(self, rhs: i32) -> Self {
+        Self {
             x: self.x * rhs,
             y: self.y * rhs,
         }

2024/aoc24/src/grid.rs

@@ -33,12 +33,12 @@ impl Grid {
     }
 
     #[must_use]
-    pub fn width(&self) -> i32 {
+    pub const fn width(&self) -> i32 {
         self.size.x
     }
 
     #[must_use]
-    pub fn height(&self) -> i32 {
+    pub const fn height(&self) -> i32 {
         self.size.y
     }
 

2024/day1/day1.rs

@@ -8,8 +8,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle {
+    const fn new() -> Self {
+        Self {
             left: vec![],
             right: vec![],
         }

2024/day10/day10.rs

@@ -11,8 +11,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle { grid: grid![] }
+    fn new() -> Self {
+        Self { grid: grid![] }
     }
 
     /// Get the puzzle input.

2024/day11/day11.rs

@@ -7,8 +7,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle { stones: Vec::new() }
+    const fn new() -> Self {
+        Self { stones: Vec::new() }
     }
 
     /// Get the puzzle input.

2024/day12/day12.rs

@@ -9,8 +9,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle {
+    const fn new() -> Self {
+        Self {
             standard_price: 0,
             discount_price: 0,
         }
@@ -98,12 +98,12 @@ impl Puzzle {
     }
 
     /// Solve part one.
-    fn part1(&self) -> u32 {
+    const fn part1(&self) -> u32 {
         self.standard_price
     }
 
     /// Solve part two.
-    fn part2(&self) -> u32 {
+    const fn part2(&self) -> u32 {
         self.discount_price
     }
 }

2024/day13/day13.rs

@@ -54,8 +54,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle { machines: vec![] }
+    const fn new() -> Self {
+        Self { machines: vec![] }
     }
 
     /// Get the puzzle input.

2024/day13_z3/day13.rs

@@ -67,8 +67,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle { machines: vec![] }
+    const fn new() -> Self {
+        Self { machines: vec![] }
     }
 
     /// Get the puzzle input.

2024/day14/day14.rs

@@ -17,8 +17,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle {
+    const fn new() -> Self {
+        Self {
             robots: Vec::new(),
             width: 101,
             height: 103,

2024/day15/day15.rs

@@ -187,8 +187,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle {
+    const fn new() -> Self {
+        Self {
             data: String::new(),
             moves: vec![],
             anim: 0,
@@ -212,7 +212,7 @@ impl Puzzle {
     }
 
     /// Solve part one.
-    fn part1(&mut self) -> i32 {
+    fn part1(&self) -> i32 {
         let (mut grid, mut robot) = init_first_warehouse(&self.data);
         let mut n = 1;