clippy nursery 🍼

Author: rene-d

2019/day1/day1.rs

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

2019/day16/day16.rs

@@ -8,7 +8,7 @@ fn parse_data(data: &str) -> Vec<u8> {
         .filter_map(|x| {
             let digit = (x as u32).wrapping_sub('0' as u32);
             if digit < 10 {
-                Some(digit as u8)
+                u8::try_from(digit).ok()
             } else {
                 None
             }
@@ -25,9 +25,9 @@ fn fft(signal: &mut [u8]) {
     for n in 0..signal.len() {
         let mut s = 0;
         for i in 0..signal.len() {
-            s += pattern[(1 + i) / (1 + n) % 4] * phase[i] as i32;
+            s += pattern[(1 + i) / (1 + n) % 4] * i32::from(phase[i]);
         }
-        signal[n] = (s.abs() % 10) as u8;
+        signal[n] = u8::try_from(s.abs() % 10).unwrap();
     }
 }
 
@@ -37,7 +37,7 @@ fn part1(data: &[u8]) -> u32 {
     for _ in 0..100 {
         fft(&mut p);
     }
-    p[0..8].iter().fold(0, |acc, d| acc * 10 + (*d as u32))
+    p[0..8].iter().fold(0, |acc, d| acc * 10 + u32::from(*d))
 }
 
 /// Solve part two: find the eight-digit message embedded in the final output list.
@@ -60,10 +60,10 @@ fn part2(data: &[u8]) -> u32 {
             t[i] = s;
         }
 
-        p = t.to_owned();
+        p.clone_from(&t);
     }
 
-    p[0..8].iter().fold(0, |acc, d| acc * 10 + (*d as u32))
+    p[0..8].iter().fold(0, |acc, d| acc * 10 + u32::from(*d))
 }
 
 fn main() {

2019/day18/src/main.rs

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

2019/day18/src/state.rs

@@ -20,7 +20,7 @@ impl State {
     /// # Panics
     /// may be...
     #[must_use]
-    pub fn next(&self, paths: &HashMap<u8, Vec<Path>>) -> Vec<(State, usize)> {
+    pub fn next(&self, paths: &HashMap<u8, Vec<Path>>) -> Vec<(Self, usize)> {
         // impl Iterator<Item = Self> {
 
         let mut result = vec![];

2019/day2/day2.rs

@@ -8,8 +8,8 @@ const ADD: u32 = 1;
 const MUL: u32 = 2;
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle {
+    const fn new() -> Self {
+        Self {
             program: Vec::new(),
         }
     }
@@ -33,7 +33,7 @@ impl Puzzle {
     fn dump(&self) -> String {
         self.program
             .iter()
-            .map(|x| x.to_string())
+            .map(std::string::ToString::to_string)
             .collect::<Vec<String>>()
             .join(",")
     }

2019/day22/day22.rs

@@ -1,9 +1,9 @@
 //! [Day 22: Slam Shuffle](https://adventofcode.com/2019/day/22)
 
-#![allow(clippy::unreadable_literal)]
+// #![allow(clippy::unreadable_literal)]
 
 // Calculates (n^x) % p
-fn modular_exponent(mut n: i128, mut x: i128, p: i128) -> i128 {
+const fn modular_exponent(mut n: i128, mut x: i128, p: i128) -> i128 {
     let mut ans = 1;
     if x <= 0 {
         return 1;
@@ -59,14 +59,14 @@ struct Congruence {
 impl Congruence {
     fn compose(&self, lhs: &Self) -> Self {
         assert_eq!(self.m, lhs.m);
-        Congruence {
+        Self {
             a: (self.a * lhs.a) % self.m,
             c: (self.c * lhs.a + lhs.c) % self.m,
             m: self.m,
         }
     }
 
-    fn value(&self, index: i128) -> i128 {
+    const fn value(&self, index: i128) -> i128 {
         (self.a * index + self.c) % self.m
     }
 
@@ -129,8 +129,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle { shuffles: vec![] }
+    const fn new() -> Self {
+        Self { shuffles: vec![] }
     }
 
     /// Get the puzzle input.
@@ -196,12 +196,12 @@ impl Puzzle {
 
     /// Solve part two.
     fn part2(&self) -> i128 {
-        let m = 119315717514047;
+        let m = 119_315_717_514_047;
         self.shuffles
             .iter()
             .fold(Congruence { a: 1, c: 0, m }, |acc, t| acc.compose(&t.op(m)))
             .inv()
-            .pow(101741582076661)
+            .pow(101_741_582_076_661)
             .value(2020)
     }
 }

2019/day3/day3.rs

@@ -44,7 +44,7 @@ fn steps(instrs: &[Instr], target: (i32, i32)) -> u32 {
     0
 }
 
-fn manhattan(p: (i32, i32)) -> i32 {
+const fn manhattan(p: (i32, i32)) -> i32 {
     p.0.abs() + p.1.abs()
 }
 
@@ -53,8 +53,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle { paths: Vec::new() }
+    const fn new() -> Self {
+        Self { paths: Vec::new() }
     }
 
     /// Get the puzzle input.

2019/day4/day4.rs

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

2019/day6/day6.rs

@@ -9,8 +9,8 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Puzzle {
-        Puzzle {
+    fn new() -> Self {
+        Self {
             orbits: HashMap::new(),
         }
     }