ruediger/advent-2022-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applied clippy

Browse source
This commit is contained in:
Ruediger Ludwig 2023-01-29 19:12:22 +01:00
parent 33eb92e9d1
commit 4e08117ed0
16 changed files with 205 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main.rs
View file

@ -11,9 +11,9 @@ use std::{
};
use thiserror::Error;
fn output(day: usize, part: usize, result: ResultType, time: Duration) -> () {
fn output(day: usize, part: usize, result: ResultType, time: Duration) {
match result {
ResultType::IntResult(value) => {
ResultType::Integer(value) => {
println!(
"Day {:02} part {}: {} ({})",
day,
@ -22,7 +22,7 @@ fn output(day: usize, part: usize, result: ResultType, time: Duration) -> () {
time.as_secs_f64()
);
}
ResultType::StringResult(value) => {
ResultType::String(value) => {
println!(
"Day {:02} part {}: {} ({})",
day,
@ -31,7 +31,7 @@ fn output(day: usize, part: usize, result: ResultType, time: Duration) -> () {
time.as_secs_f32()
);
}
ResultType::LinesResult(value) => {
ResultType::Lines(value) => {
println!(
"Day {:02} part {}: {} ({})",
day,
@ -40,14 +40,14 @@ fn output(day: usize, part: usize, result: ResultType, time: Duration) -> () {
time.as_secs_f32()
);
for line in &value[1..] {
println!(" part : {}", line);
println!(" part : {line}");
}
}
ResultType::NoResult => {}
ResultType::Nothing => {}
}
}
fn run_part(day: &Box<dyn DayTrait>, is_part1: bool, lines: &[String]) -> Result<Duration> {
fn run_part(day: &dyn DayTrait, is_part1: bool, lines: &[String]) -> Result<Duration> {
let now = Instant::now();
let result = if is_part1 {
day.part1(lines)?
@ -55,7 +55,7 @@ fn run_part(day: &Box<dyn DayTrait>, is_part1: bool, lines: &[String]) -> Result
day.part2(lines)?
};
if matches!(result, ResultType::NoResult) {
if matches!(result, ResultType::Nothing) {
Ok(Duration::ZERO)
} else {
let elapsed = now.elapsed();
@ -69,7 +69,7 @@ fn run_part(day: &Box<dyn DayTrait>, is_part1: bool, lines: &[String]) -> Result
}
}
fn run(day: &Box<dyn DayTrait>, part1: bool, part2: bool) -> Result<Duration> {
fn run(day: &dyn DayTrait, part1: bool, part2: bool) -> Result<Duration> {
let lines = read_lines(day.get_day_number(), "input.txt")?;
let elapsed1 = if part1 {
run_part(day, true, &lines)?
@ -99,25 +99,25 @@ fn run_on_parameters(params: &[String]) -> Result<()> {
0 => {
let mut runtime = Duration::ZERO;
for day in day_provider::get_all_days() {
runtime += run(&day, true, true)?;
runtime += run(day.as_ref(), true, true)?;
}
println!();
println!("Runtime: {}", runtime.as_secs_f32());
}
1 => {
let mut parts = params[0].split("/");
let mut parts = params[0].split('/');
if let Some(day_str) = parts.next() {
let day_number = day_str.parse::<usize>()?;
let day = day_provider::get_day(day_number)?;
if let Some(part_str) = parts.next() {
match part_str.parse::<usize>()? {
1 => run(&day, true, false)?,
2 => run(&day, false, true)?,
1 => run(day.as_ref(), true, false)?,
2 => run(day.as_ref(), false, true)?,
p => Err(ParamError::UnknownPart(p))?,
};
} else {
let runtime = run(&day, true, true)?;
let runtime = run(day.as_ref(), true, true)?;
println!("Runtime: {}", runtime.as_secs_f32());
}
}