diff --git a/crates/cli/src/benchmarking/file_to_benchmark.rs b/crates/cli/src/benchmarking/file_to_benchmark.rs index 7208ae9..c365093 100644 --- a/crates/cli/src/benchmarking/file_to_benchmark.rs +++ b/crates/cli/src/benchmarking/file_to_benchmark.rs @@ -19,9 +19,9 @@ pub struct FileToBenchmark { expected_output: String, } -impl Into<(GivenDay, GivenTask, String)> for FileToBenchmark { - fn into(self) -> (GivenDay, GivenTask, String) { - (self.given_day, self.given_task, self.expected_output) +impl From for (GivenDay, GivenTask, String) { + fn from(val: FileToBenchmark) -> Self { + (val.given_day, val.given_task, val.expected_output) } } diff --git a/crates/cli/src/benchmarking/row_building.rs b/crates/cli/src/benchmarking/row_building.rs index ecaef11..d068981 100644 --- a/crates/cli/src/benchmarking/row_building.rs +++ b/crates/cli/src/benchmarking/row_building.rs @@ -36,7 +36,7 @@ pub fn create_average_row(average: Duration) -> std::iter::Once> { } pub fn create_rows_for_every_solutions(loaded: Vec) -> MatrixReport { - let after_header = loaded + loaded .into_iter() .map(|result| { vec![ @@ -50,6 +50,5 @@ pub fn create_rows_for_every_solutions(loaded: Vec) -> MatrixRe .unwrap_or_else(|| result.expected_output().to_string()), ] }) - .collect(); - after_header + .collect() } diff --git a/crates/cli/src/cli/given_day.rs b/crates/cli/src/cli/given_day.rs index 26c8556..9fa8ac4 100644 --- a/crates/cli/src/cli/given_day.rs +++ b/crates/cli/src/cli/given_day.rs @@ -22,10 +22,10 @@ pub struct GivenDay(u32); impl GivenDay { pub fn new(value: u32) -> Result { - if value < 1 || value > constants::MAX_DAY { - Err(InvalidGivenDayError::InvalidRange(value)) - } else { + if (1..=constants::MAX_DAY).contains(&value) { Ok(Self(value)) + } else { + Err(InvalidGivenDayError::InvalidRange(value)) } } } diff --git a/crates/cli/src/cli/given_task.rs b/crates/cli/src/cli/given_task.rs index 3e5a43b..2a4fe59 100644 --- a/crates/cli/src/cli/given_task.rs +++ b/crates/cli/src/cli/given_task.rs @@ -24,10 +24,10 @@ pub struct GivenTask(u32); impl GivenTask { pub fn new(value: u32) -> Result { - if value < 1 || value > constants::MAX_TASK { - Err(InvalidGivenTaskError::InvalidRange(value)) - } else { + if (1..=constants::MAX_TASK).contains(&value) { Ok(Self(value)) + } else { + Err(InvalidGivenTaskError::InvalidRange(value)) } } } diff --git a/crates/cli/src/solving_given.rs b/crates/cli/src/solving_given.rs index 575abdb..24f7a28 100644 --- a/crates/cli/src/solving_given.rs +++ b/crates/cli/src/solving_given.rs @@ -32,8 +32,7 @@ pub fn solve_given_from_cli(args: &CliSolutionToSolve) -> AppResult { fn try_read_from_file_if_demanded(args: &CliSolutionToSolve) -> io::Result { let content = if args.read_as_file() { let path = Path::new(args.input()); - let input_as_file = fs::read_to_string(path)?; - input_as_file + fs::read_to_string(path)? } else { args.input().to_string() };