clippy nursery 🍼 (many)

Author: rene-d

2022/day1/day1.rs

@@ -5,8 +5,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle {
+    const fn new() -> Self {
+        Self {
             calories: Vec::new(),
         }
     }

2022/day10/day10.rs

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

2022/day11/day11.rs

@@ -10,20 +10,20 @@ enum Operation {
 impl Operation {
     fn new(s: &str) -> Self {
         if s == "old * old" {
-            return Operation::Square;
+            return Self::Square;
         } else if let Some(m) = s.strip_prefix("old + ") {
-            return Operation::Addition(m.parse().unwrap());
+            return Self::Addition(m.parse().unwrap());
         } else if let Some(m) = s.strip_prefix("old * ") {
-            return Operation::Product(m.parse().unwrap());
+            return Self::Product(m.parse().unwrap());
         }
         panic!("bad operation {s}")
     }
 
     fn calc(&self, arg: u64) -> u64 {
         match self {
-            Operation::Square => arg * arg,
-            Operation::Addition(n) => arg + n,
-            Operation::Product(n) => arg * n,
+            Self::Square => arg * arg,
+            Self::Addition(n) => arg + n,
+            Self::Product(n) => arg * n,
         }
     }
 }
@@ -43,7 +43,7 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Self {
+    const fn new() -> Self {
         Self { monkeys: vec![] }
     }
 

2022/day12/day12.rs

@@ -17,7 +17,7 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Self {
+    const fn new() -> Self {
         Self {
             grid: vec![],
             start: (0, 0),

2022/day13/day13.rs

@@ -71,7 +71,7 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Self {
+    const fn new() -> Self {
         Self { packets: vec![] }
     }
 
@@ -118,6 +118,15 @@ impl Puzzle {
     }
 }
 
+/// main function
+fn main() {
+    let args = aoc::parse_args();
+    let mut puzzle = Puzzle::new();
+    puzzle.configure(&args.path);
+    println!("{}", puzzle.part1());
+    println!("{}", puzzle.part2());
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -130,12 +139,3 @@ mod test {
         assert_eq!(puzzle.part2(), 140);
     }
 }
-
-/// main function
-fn main() {
-    let args = aoc::parse_args();
-    let mut puzzle = Puzzle::new();
-    puzzle.configure(&args.path);
-    println!("{}", puzzle.part1());
-    println!("{}", puzzle.part2());
-}

2022/day13_nom/day13.rs

@@ -30,10 +30,10 @@ impl Packet {
 
     fn cmp(&self, other: &Self) -> Ordering {
         match (self, other) {
-            (Packet::Integer(a), Packet::Integer(b)) => a.cmp(b),
-            (Packet::Integer(_), Packet::Array(_)) => Packet::Array(vec![self.clone()]).cmp(other),
-            (Packet::Array(_), Packet::Integer(_)) => self.cmp(&Packet::Array(vec![other.clone()])),
-            (Packet::Array(a), Packet::Array(b)) => {
+            (Self::Integer(a), Self::Integer(b)) => a.cmp(b),
+            (Self::Integer(_), Self::Array(_)) => Self::Array(vec![self.clone()]).cmp(other),
+            (Self::Array(_), Self::Integer(_)) => self.cmp(&Self::Array(vec![other.clone()])),
+            (Self::Array(a), Self::Array(b)) => {
                 let mut iter_a = a.iter();
                 let mut iter_b = b.iter();
                 loop {
@@ -58,7 +58,7 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Self {
+    const fn new() -> Self {
         Self { packets: vec![] }
     }
 

2022/day14/day14.rs

@@ -77,10 +77,10 @@ impl Puzzle {
             if y + 1 >= self.floor {
                 if part2 {
                     break;
-                } else {
-                    // sand is beyond the lowest rock
-                    return false;
                 }
+
+                // sand is beyond the lowest rock
+                return false;
             }
 
             if self.is_empty(x, y + 1) {

2022/day15/day15.rs

@@ -4,7 +4,7 @@ use regex::Regex;
 use std::collections::HashSet;
 
 /// Computes the [Manhattan distance](https://en.wikipedia.org/wiki/Taxicab_geometry) between two points
-fn manhattan(ax: i64, ay: i64, bx: i64, by: i64) -> i64 {
+const fn manhattan(ax: i64, ay: i64, bx: i64, by: i64) -> i64 {
     (ax - bx).abs() + (ay - by).abs()
 }
 

2022/day16/day16.rs

@@ -29,7 +29,7 @@ impl Puzzle {
         )
         .unwrap();
 
-        for line in data.split('\n').collect::<Vec<_>>() {
+        for line in data.split('\n') {
             if let Some(m) = re.captures(line) {
                 let valve = self.valve_id_new(&m[1]);
 
@@ -57,7 +57,7 @@ impl Puzzle {
         }
     }
 
-    fn distance(&self, a: u8, b: u8) -> u32 {
+    const fn distance(&self, a: u8, b: u8) -> u32 {
         self.distances[a as usize][b as usize]
     }
 

2022/day19/day19.rs

@@ -208,7 +208,7 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Self {
+    const fn new() -> Self {
         Self { blueprints: vec![] }
     }