uku/advent-of-code-2024
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: use into for answers

Browse source
This commit is contained in:
uku 2024-12-08 14:46:37 +01:00
parent a67033d39b
commit 6a54618880
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
7 changed files with 33 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/solutions/day_01.rs
View file

@ -19,13 +19,11 @@ impl Solution for Day01 {
left.sort(); left.sort();
right.sort(); right.sort();
let sum: i32 = left left.into_iter()
.into_iter()
.zip(right) .zip(right)
.map(|(a, b)| (a - b).abs()) .map(|(a, b)| (a - b).abs())
.sum(); .sum::<i32>()
.into()
Answer::Number(sum as u64)
} }
fn part_b(&self, input: &str) -> Answer { fn part_b(&self, input: &str) -> Answer {
@ -37,12 +35,10 @@ impl Solution for Day01 {
let counts = right.into_iter().counts(); let counts = right.into_iter().counts();
let sum = left left.into_iter()
.into_iter()
.map(|n| counts.get(&n).unwrap_or(&0) * (n as usize)) .map(|n| counts.get(&n).unwrap_or(&0) * (n as usize))
.sum::<usize>(); .sum::<usize>()
.into()
Answer::Number(sum as u64)
} }
} }

14
src/solutions/day_02.rs
View file

@ -10,20 +10,19 @@ impl Solution for Day02 {
} }
fn part_a(&self, input: &str) -> Answer { fn part_a(&self, input: &str) -> Answer {
let reports = input input
.lines() .lines()
.filter(|l| { .filter(|l| {
let nums = l.split_whitespace().map(|n| n.parse::<i32>().unwrap()); let nums = l.split_whitespace().map(|n| n.parse::<i32>().unwrap());
is_valid(&nums) is_valid(&nums)
}) })
.count(); .count()
.into()
Answer::Number(reports as u64)
} }
fn part_b(&self, input: &str) -> Answer { fn part_b(&self, input: &str) -> Answer {
let reports = input input
.lines() .lines()
.filter(|l| { .filter(|l| {
let nums = l.split_whitespace().map(|n| n.parse::<i32>().unwrap()); let nums = l.split_whitespace().map(|n| n.parse::<i32>().unwrap());
@ -45,9 +44,8 @@ impl Solution for Day02 {
valid valid
}) })
.count(); .count()
.into()
Answer::Number(reports as u64)
} }
} }

8
src/solutions/day_03.rs
View file

@ -13,13 +13,11 @@ impl Solution for Day03 {
fn part_a(&self, input: &str) -> Answer { fn part_a(&self, input: &str) -> Answer {
let re = Regex::new(r"mul\((\d+),(\d+)\)").unwrap(); let re = Regex::new(r"mul\((\d+),(\d+)\)").unwrap();
let sum = re re.captures_iter(input)
.captures_iter(input)
.map(|c| c.extract()) .map(|c| c.extract())
.map(|(_, [a, b])| a.parse::<u64>().unwrap() * b.parse::<u64>().unwrap()) .map(|(_, [a, b])| a.parse::<u64>().unwrap() * b.parse::<u64>().unwrap())
.sum::<u64>(); .sum::<u64>()
.into()
Answer::Number(sum)
} }
fn part_b(&self, input: &str) -> Answer { fn part_b(&self, input: &str) -> Answer {

6
src/solutions/day_04.rs
View file

@ -17,9 +17,7 @@ impl Solution for Day04 {
.map(xmas_count) .map(xmas_count)
.sum::<usize>(); .sum::<usize>();
let sum = horizontal + vertical + diag_45 + diag_135; (horizontal + vertical + diag_45 + diag_135).into()
Answer::Number(sum as u64)
} }
fn part_b(&self, input: &str) -> Answer { fn part_b(&self, input: &str) -> Answer {
@ -32,7 +30,7 @@ impl Solution for Day04 {
+ cross_mas_count(&input_180) + cross_mas_count(&input_180)
+ cross_mas_count(&input_270); + cross_mas_count(&input_270);
Answer::Number(sum as u64) sum.into()
} }
} }

14
src/solutions/day_05.rs
View file

@ -21,7 +21,7 @@ impl Solution for Day05 {
.into_grouping_map() .into_grouping_map()
.collect::<HashSet<_>>(); .collect::<HashSet<_>>();
let sum = input input
.lines() .lines()
.map(|l| { .map(|l| {
l.split(",") l.split(",")
@ -33,9 +33,8 @@ impl Solution for Day05 {
let middle = (nums.len() - 1) / 2; let middle = (nums.len() - 1) / 2;
nums[middle] nums[middle]
}) })
.sum::<u64>(); .sum::<u64>()
.into()
Answer::Number(sum)
} }
fn part_b(&self, input: &str) -> Answer { fn part_b(&self, input: &str) -> Answer {
@ -48,7 +47,7 @@ impl Solution for Day05 {
.into_grouping_map() .into_grouping_map()
.collect::<HashSet<_>>(); .collect::<HashSet<_>>();
let sum = input input
.lines() .lines()
.map(|l| { .map(|l| {
l.split(",") l.split(",")
@ -83,9 +82,8 @@ impl Solution for Day05 {
let middle = (nums.len() - 1) / 2; let middle = (nums.len() - 1) / 2;
nums[middle] nums[middle]
}) })
.sum::<u64>(); .sum::<u64>()
.into()
Answer::Number(sum)
} }
} }

9
src/solutions/day_06.rs
View file

@ -27,7 +27,7 @@ impl Solution for Day06 {
direction: Direction::Up, direction: Direction::Up,
}; };
Answer::Number(get_positions(&grid, guard).len() as u64) get_positions(&grid, guard).len().into()
} }
fn part_b(&self, input: &str) -> Answer { fn part_b(&self, input: &str) -> Answer {
@ -48,7 +48,7 @@ impl Solution for Day06 {
direction: Direction::Up, direction: Direction::Up,
}; };
let count = get_positions(&grid, guard) get_positions(&grid, guard)
.iter() .iter()
.filter(|&&coords| { .filter(|&&coords| {
let tmp_guard = Guard { let tmp_guard = Guard {
@ -58,9 +58,8 @@ impl Solution for Day06 {
is_infinite_loop(&grid, tmp_guard, coords) is_infinite_loop(&grid, tmp_guard, coords)
}) })
.count(); .count()
.into()
Answer::Number(count as u64)
} }
} }

14
src/solutions/day_07.rs
View file

@ -8,7 +8,7 @@ impl Solution for Day07 {
} }
fn part_a(&self, input: &str) -> Answer { fn part_a(&self, input: &str) -> Answer {
let sum = input input
.lines() .lines()
.map(|l| l.split_once(": ").unwrap()) .map(|l| l.split_once(": ").unwrap())
.map(|(a, b)| { .map(|(a, b)| {
@ -38,13 +38,12 @@ impl Solution for Day07 {
None None
}) })
.sum::<u64>(); .sum::<u64>()
.into()
Answer::Number(sum)
} }
fn part_b(&self, input: &str) -> Answer { fn part_b(&self, input: &str) -> Answer {
let sum = input input
.lines() .lines()
.map(|l| l.split_once(": ").unwrap()) .map(|l| l.split_once(": ").unwrap())
.map(|(a, b)| { .map(|(a, b)| {
@ -74,9 +73,8 @@ impl Solution for Day07 {
None None
}) })
.sum::<u64>(); .sum::<u64>()
.into()
Answer::Number(sum)
} }
} }