Refactor common parts

This commit is contained in:
2022-12-04 11:18:03 +01:00
parent 9d23e80256
commit 6802a7bf33

View File

@@ -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)]