From d62345b5c0e9b9398cdbe2130cac40f6d7a6d321 Mon Sep 17 00:00:00 2001 From: Anthony Oteri Date: Tue, 12 Dec 2023 16:10:25 -0500 Subject: [PATCH] Fix clippy issues on all days Signed-off-by: Anthony Oteri --- day-01/src/main.rs | 12 ++++-------- day-02/src/main.rs | 2 +- day-04/src/main.rs | 10 +++++----- day-06/src/main.rs | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/day-01/src/main.rs b/day-01/src/main.rs index 95628b6..6a0e457 100644 --- a/day-01/src/main.rs +++ b/day-01/src/main.rs @@ -1,12 +1,10 @@ fn part_1(input: &str) -> u32 { let values: Vec = input .lines() - .into_iter() .map(|line| { let numbers: Vec = line .chars() - .into_iter() - .filter(|c| c.is_digit(10)) + .filter(|c| c.is_ascii_digit()) .map(|c| c.to_digit(10).unwrap() as u8) .collect(); @@ -20,9 +18,8 @@ fn part_1(input: &str) -> u32 { fn part_2(input: &str) -> u32 { let values: Vec = input .lines() - .into_iter() .map(|line| { - let before = line.clone(); + let before = line; let line = line .to_owned() @@ -58,14 +55,13 @@ fn part_2(input: &str) -> u32 { let numbers: Vec = line .chars() - .into_iter() - .filter(|c| c.is_digit(10)) + .filter(|c| c.is_ascii_digit()) .map(|c| c.to_digit(10).unwrap() as u8) .collect(); let sum: u32 = numbers[0] as u32 * 10 + *numbers.last().unwrap() as u32; println!("{before} -> {line} => {numbers:?} => {sum}"); - assert!(sum >= 10 && sum <= 99); + assert!((10..=99).contains(&sum)); sum }) .collect(); diff --git a/day-02/src/main.rs b/day-02/src/main.rs index 92d0cd7..6fb36b0 100644 --- a/day-02/src/main.rs +++ b/day-02/src/main.rs @@ -47,7 +47,7 @@ fn parse_input(input: &str) -> Vec { for line in input.lines() { let mut bags = Vec::new(); - let (game_part, bags_part) = line.split_once(":").unwrap(); + let (game_part, bags_part) = line.split_once(':').unwrap(); let game_id = game_part .strip_prefix("Game ") diff --git a/day-04/src/main.rs b/day-04/src/main.rs index b984c34..2464281 100644 --- a/day-04/src/main.rs +++ b/day-04/src/main.rs @@ -11,7 +11,7 @@ impl Card { fn winner(&self) -> usize { let mut count = 0; for guess in &self.winning_numbers { - if self.game_numbers.contains(&guess) { + if self.game_numbers.contains(guess) { count += 1; } } @@ -33,7 +33,7 @@ fn parse_input(input: &str) -> Vec { for line in input.lines() { let mut card = Card::default(); - let (id_part, numbers_part) = line.split_once(":").unwrap(); + let (id_part, numbers_part) = line.split_once(':').unwrap(); card.id = id_part .strip_prefix("Card") .unwrap() @@ -41,7 +41,7 @@ fn parse_input(input: &str) -> Vec { .parse::() .unwrap(); - let (winning_numbers_part, gamen_numbers_part) = numbers_part.split_once("|").unwrap(); + let (winning_numbers_part, gamen_numbers_part) = numbers_part.split_once('|').unwrap(); card.winning_numbers = winning_numbers_part .split_whitespace() @@ -97,8 +97,8 @@ fn part_2(input: &str) -> usize { fn main() { let input = include_str!("../input.txt"); - println!("Part 1: {}", part_1(&input)); - println!("Part 2: {}", part_2(&input)); + println!("Part 1: {}", part_1(input)); + println!("Part 2: {}", part_2(input)); } #[cfg(test)] diff --git a/day-06/src/main.rs b/day-06/src/main.rs index d4e5a29..507d8dc 100644 --- a/day-06/src/main.rs +++ b/day-06/src/main.rs @@ -77,8 +77,8 @@ fn part2_preformat(input: &str) -> String { let input = String::from(input); input .lines() - .map(|l| l.replace(" ", "")) - .map(|l| l.replace(":", ": ")) + .map(|l| l.replace(' ', "")) + .map(|l| l.replace(':', ": ")) .collect::>() .join("\n") }