cleanup
This commit is contained in:
19
src/day03.rs
19
src/day03.rs
@@ -11,15 +11,11 @@ pub fn day_main() {
|
|||||||
type RiddleResult = i64;
|
type RiddleResult = i64;
|
||||||
|
|
||||||
fn part1(input: &str) -> RiddleResult {
|
fn part1(input: &str) -> RiddleResult {
|
||||||
let r = regex::Regex::new(r"mul\(\d{1,3},\d{1,3}\)").unwrap();
|
let r = regex::Regex::new(r"mul\((\d{1,3}),(\d{1,3})\)").unwrap();
|
||||||
r.captures_iter(input)
|
r.captures_iter(input)
|
||||||
.map(|c| {
|
.map(|c| {
|
||||||
let s = c.get(0).unwrap().as_str();
|
let a: i64 = c.get(1).unwrap().as_str().parse().unwrap();
|
||||||
println!("{s}");
|
let b: i64 = c.get(2).unwrap().as_str().parse().unwrap();
|
||||||
let x = s.strip_prefix("mul(").unwrap().strip_suffix(")").unwrap();
|
|
||||||
let (a, b) = x.split_once(',').unwrap();
|
|
||||||
let a: i64 = a.parse().unwrap();
|
|
||||||
let b: i64 = b.parse().unwrap();
|
|
||||||
a * b
|
a * b
|
||||||
})
|
})
|
||||||
.sum()
|
.sum()
|
||||||
@@ -32,21 +28,18 @@ enum Statement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn part2(input: &str) -> RiddleResult {
|
fn part2(input: &str) -> RiddleResult {
|
||||||
let r = regex::Regex::new(r"do\(\)|don't\(\)|mul\(\d{1,3},\d{1,3}\)").unwrap();
|
let r = regex::Regex::new(r"do\(\)|don't\(\)|mul\((\d{1,3}),(\d{1,3})\)").unwrap();
|
||||||
let statements = r
|
let statements = r
|
||||||
.captures_iter(input)
|
.captures_iter(input)
|
||||||
.map(|c| {
|
.map(|c| {
|
||||||
let s = c.get(0).unwrap().as_str();
|
let s = c.get(0).unwrap().as_str();
|
||||||
println!("{s}");
|
|
||||||
|
|
||||||
match s {
|
match s {
|
||||||
"do()" => Statement::Enable,
|
"do()" => Statement::Enable,
|
||||||
"don't()" => Statement::Disable,
|
"don't()" => Statement::Disable,
|
||||||
_ => {
|
_ => {
|
||||||
let x = s.strip_prefix("mul(").unwrap().strip_suffix(")").unwrap();
|
let a: i64 = c.get(1).unwrap().as_str().parse().unwrap();
|
||||||
let (a, b) = x.split_once(',').unwrap();
|
let b: i64 = c.get(2).unwrap().as_str().parse().unwrap();
|
||||||
let a: i64 = a.parse().unwrap();
|
|
||||||
let b: i64 = b.parse().unwrap();
|
|
||||||
Statement::Number(a * b)
|
Statement::Number(a * b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user