mirror of
https://github.com/anthonyoteri/advent-of-code-2023.git
synced 2026-06-05 19:56:53 -04:00
Fix clippy issues on all days
Signed-off-by: Anthony Oteri <anthony.oteri@gmail.com>
This commit is contained in:
+4
-8
@@ -1,12 +1,10 @@
|
|||||||
fn part_1(input: &str) -> u32 {
|
fn part_1(input: &str) -> u32 {
|
||||||
let values: Vec<u32> = input
|
let values: Vec<u32> = input
|
||||||
.lines()
|
.lines()
|
||||||
.into_iter()
|
|
||||||
.map(|line| {
|
.map(|line| {
|
||||||
let numbers: Vec<u8> = line
|
let numbers: Vec<u8> = line
|
||||||
.chars()
|
.chars()
|
||||||
.into_iter()
|
.filter(|c| c.is_ascii_digit())
|
||||||
.filter(|c| c.is_digit(10))
|
|
||||||
.map(|c| c.to_digit(10).unwrap() as u8)
|
.map(|c| c.to_digit(10).unwrap() as u8)
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
@@ -20,9 +18,8 @@ fn part_1(input: &str) -> u32 {
|
|||||||
fn part_2(input: &str) -> u32 {
|
fn part_2(input: &str) -> u32 {
|
||||||
let values: Vec<u32> = input
|
let values: Vec<u32> = input
|
||||||
.lines()
|
.lines()
|
||||||
.into_iter()
|
|
||||||
.map(|line| {
|
.map(|line| {
|
||||||
let before = line.clone();
|
let before = line;
|
||||||
|
|
||||||
let line = line
|
let line = line
|
||||||
.to_owned()
|
.to_owned()
|
||||||
@@ -58,14 +55,13 @@ fn part_2(input: &str) -> u32 {
|
|||||||
|
|
||||||
let numbers: Vec<u8> = line
|
let numbers: Vec<u8> = line
|
||||||
.chars()
|
.chars()
|
||||||
.into_iter()
|
.filter(|c| c.is_ascii_digit())
|
||||||
.filter(|c| c.is_digit(10))
|
|
||||||
.map(|c| c.to_digit(10).unwrap() as u8)
|
.map(|c| c.to_digit(10).unwrap() as u8)
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let sum: u32 = numbers[0] as u32 * 10 + *numbers.last().unwrap() as u32;
|
let sum: u32 = numbers[0] as u32 * 10 + *numbers.last().unwrap() as u32;
|
||||||
println!("{before} -> {line} => {numbers:?} => {sum}");
|
println!("{before} -> {line} => {numbers:?} => {sum}");
|
||||||
assert!(sum >= 10 && sum <= 99);
|
assert!((10..=99).contains(&sum));
|
||||||
sum
|
sum
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ fn parse_input(input: &str) -> Vec<Game> {
|
|||||||
for line in input.lines() {
|
for line in input.lines() {
|
||||||
let mut bags = Vec::new();
|
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
|
let game_id = game_part
|
||||||
.strip_prefix("Game ")
|
.strip_prefix("Game ")
|
||||||
|
|||||||
+5
-5
@@ -11,7 +11,7 @@ impl Card {
|
|||||||
fn winner(&self) -> usize {
|
fn winner(&self) -> usize {
|
||||||
let mut count = 0;
|
let mut count = 0;
|
||||||
for guess in &self.winning_numbers {
|
for guess in &self.winning_numbers {
|
||||||
if self.game_numbers.contains(&guess) {
|
if self.game_numbers.contains(guess) {
|
||||||
count += 1;
|
count += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ fn parse_input(input: &str) -> Vec<Card> {
|
|||||||
for line in input.lines() {
|
for line in input.lines() {
|
||||||
let mut card = Card::default();
|
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
|
card.id = id_part
|
||||||
.strip_prefix("Card")
|
.strip_prefix("Card")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
@@ -41,7 +41,7 @@ fn parse_input(input: &str) -> Vec<Card> {
|
|||||||
.parse::<usize>()
|
.parse::<usize>()
|
||||||
.unwrap();
|
.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
|
card.winning_numbers = winning_numbers_part
|
||||||
.split_whitespace()
|
.split_whitespace()
|
||||||
@@ -97,8 +97,8 @@ fn part_2(input: &str) -> usize {
|
|||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let input = include_str!("../input.txt");
|
let input = include_str!("../input.txt");
|
||||||
println!("Part 1: {}", part_1(&input));
|
println!("Part 1: {}", part_1(input));
|
||||||
println!("Part 2: {}", part_2(&input));
|
println!("Part 2: {}", part_2(input));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
+2
-2
@@ -77,8 +77,8 @@ fn part2_preformat(input: &str) -> String {
|
|||||||
let input = String::from(input);
|
let input = String::from(input);
|
||||||
input
|
input
|
||||||
.lines()
|
.lines()
|
||||||
.map(|l| l.replace(" ", ""))
|
.map(|l| l.replace(' ', ""))
|
||||||
.map(|l| l.replace(":", ": "))
|
.map(|l| l.replace(':', ": "))
|
||||||
.collect::<Vec<String>>()
|
.collect::<Vec<String>>()
|
||||||
.join("\n")
|
.join("\n")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user