mirror of
https://github.com/bertptrs/adventofcode.git
synced 2025-12-25 21:00:31 +01:00
Refactor common parts
This commit is contained in:
@@ -49,26 +49,23 @@ fn parse_assignments(input: &[u8]) -> IResult<&[u8], Vec<(Assignment, Assignment
|
|||||||
many0(terminated(parse_line, newline))(input)
|
many0(terminated(parse_line, newline))(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn part1(input: &[u8]) -> Result<String> {
|
fn parts_common(input: &[u8], filter: impl Fn(Assignment, Assignment) -> bool) -> Result<String> {
|
||||||
let assigments = parse_input(input, parse_assignments)?;
|
let assigments = parse_input(input, parse_assignments)?;
|
||||||
|
|
||||||
let overlapping = assigments
|
let overlapping = assigments
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter(|&(a, b)| a.one_contains(b))
|
.filter(|&(a, b)| filter(a, b))
|
||||||
.count();
|
.count();
|
||||||
|
|
||||||
Ok(overlapping.to_string())
|
Ok(overlapping.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn part1(input: &[u8]) -> Result<String> {
|
||||||
|
parts_common(input, Assignment::one_contains)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn part2(input: &[u8]) -> Result<String> {
|
pub fn part2(input: &[u8]) -> Result<String> {
|
||||||
let assigments = parse_input(input, parse_assignments)?;
|
parts_common(input, Assignment::one_overlaps)
|
||||||
|
|
||||||
let overlapping = assigments
|
|
||||||
.into_iter()
|
|
||||||
.filter(|&(a, b)| a.one_overlaps(b))
|
|
||||||
.count();
|
|
||||||
|
|
||||||
Ok(overlapping.to_string())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
Reference in New Issue
Block a user