clippy

6 files changed, 15 insertions, 7 deletions

diff --git a/src/2020/mod.rs b/src/2020/mod.rs
index c8d45a0..83e6a6e 100644
--- a/src/2020/mod.rs
+++ b/src/2020/mod.rs
@@ -21,6 +21,7 @@ mod day9;
 // NEXT MOD
 
 pub fn run(day: u8, puzzle: u8) -> Result<i64> {
+    #[allow(clippy::match_single_binding)]
     match (day, puzzle) {
         (1, 1) => day1::part1(day1::parse(parse::data(2020, 1)?)?),
         (1, 2) => day1::part2(day1::parse(parse::data(2020, 1)?)?),
diff --git a/src/2021/24/mod.rs b/src/2021/24/mod.rs
index 9fcaac1..69c7bc9 100644
--- a/src/2021/24/mod.rs
+++ b/src/2021/24/mod.rs
@@ -153,7 +153,7 @@ impl Alu {
     }
 }
 
-impl<'a> std::fmt::Display for Alu {
+impl std::fmt::Display for Alu {
     fn fmt(
         &self,
         f: &mut std::fmt::Formatter<'_>,
diff --git a/src/2021/4/mod.rs b/src/2021/4/mod.rs
index 8dd35c1..ff6d061 100644
--- a/src/2021/4/mod.rs
+++ b/src/2021/4/mod.rs
@@ -77,8 +77,7 @@ impl Game {
                 line.clear();
                 input.read_line(&mut line)?;
                 numbers.extend(
-                    line.trim()
-                        .split_whitespace()
+                    line.split_whitespace()
                         .map(|s| s.parse())
                         .collect::<Result<Vec<u8>, _>>()?,
                 );
diff --git a/src/2021/5/mod.rs b/src/2021/5/mod.rs
index 6b413b0..4b472b2 100644
--- a/src/2021/5/mod.rs
+++ b/src/2021/5/mod.rs
@@ -96,10 +96,16 @@ pub fn part1(coords: impl Iterator<Item = Vec<usize>>) -> Result<i64> {
 pub fn part2(coords: impl Iterator<Item = Vec<usize>>) -> Result<i64> {
     let mut map = Map::default();
     for nums in coords {
-        let _ = map.mark_horizontal(nums[0], nums[1], nums[2], nums[3])
-            || map.mark_vertical(nums[0], nums[1], nums[2], nums[3])
-            || map.mark_diagonal(nums[0], nums[1], nums[2], nums[3])
-            || unreachable!();
+        if map.mark_horizontal(nums[0], nums[1], nums[2], nums[3]) {
+            continue;
+        }
+        if map.mark_vertical(nums[0], nums[1], nums[2], nums[3]) {
+            continue;
+        }
+        if map.mark_diagonal(nums[0], nums[1], nums[2], nums[3]) {
+            continue;
+        }
+        unreachable!();
     }
     Ok(map.count_overlapping().try_into()?)
 }
diff --git a/src/2021/mod.rs b/src/2021/mod.rs
index e7a838b..ae79cca 100644
--- a/src/2021/mod.rs
+++ b/src/2021/mod.rs
@@ -53,6 +53,7 @@ mod day25;
 // NEXT MOD
 
 pub fn run(day: u8, puzzle: u8) -> Result<i64> {
+    #[allow(clippy::match_single_binding)]
     match (day, puzzle) {
         (1, 1) => day1::part1(day1::parse(parse::data(2021, 1)?)?),
         (1, 2) => day1::part2(day1::parse(parse::data(2021, 1)?)?),
diff --git a/src/2022/mod.rs b/src/2022/mod.rs
index c987a06..3b1ed1b 100644
--- a/src/2022/mod.rs
+++ b/src/2022/mod.rs
@@ -3,6 +3,7 @@ use crate::prelude::*;
 // NEXT MOD
 
 pub fn run(day: u8, puzzle: u8) -> Result<i64> {
+    #[allow(clippy::match_single_binding)]
     match (day, puzzle) {
         // NEXT PART
         _ => Err(anyhow!("unknown puzzle {}-{}", day, puzzle)),