use day! macros instead of new + unwrap
This commit is contained in:
parent
2e223f9c7a
commit
e3d77e5610
2 changed files with 8 additions and 8 deletions
|
@ -204,7 +204,7 @@ mod child_commands {
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::parse_exec_time;
|
use super::parse_exec_time;
|
||||||
|
|
||||||
use crate::Day;
|
use crate::day;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_well_formed() {
|
fn test_well_formed() {
|
||||||
|
@ -214,7 +214,7 @@ mod child_commands {
|
||||||
"Part 2: 10 (74.13ms @ 99999 samples)".into(),
|
"Part 2: 10 (74.13ms @ 99999 samples)".into(),
|
||||||
"".into(),
|
"".into(),
|
||||||
],
|
],
|
||||||
Day::new(1).unwrap(),
|
day!(1),
|
||||||
);
|
);
|
||||||
assert_approx_eq!(res.total_nanos, 74130074.13_f64);
|
assert_approx_eq!(res.total_nanos, 74130074.13_f64);
|
||||||
assert_eq!(res.part_1.unwrap(), "74.13ns");
|
assert_eq!(res.part_1.unwrap(), "74.13ns");
|
||||||
|
@ -229,7 +229,7 @@ mod child_commands {
|
||||||
"Part 2: 10s (100ms @ 1 samples)".into(),
|
"Part 2: 10s (100ms @ 1 samples)".into(),
|
||||||
"".into(),
|
"".into(),
|
||||||
],
|
],
|
||||||
Day::new(1).unwrap(),
|
day!(1),
|
||||||
);
|
);
|
||||||
assert_approx_eq!(res.total_nanos, 2100000000_f64);
|
assert_approx_eq!(res.total_nanos, 2100000000_f64);
|
||||||
assert_eq!(res.part_1.unwrap(), "2s");
|
assert_eq!(res.part_1.unwrap(), "2s");
|
||||||
|
@ -244,7 +244,7 @@ mod child_commands {
|
||||||
"Part 2: ✖ ".into(),
|
"Part 2: ✖ ".into(),
|
||||||
"".into(),
|
"".into(),
|
||||||
],
|
],
|
||||||
Day::new(1).unwrap(),
|
day!(1),
|
||||||
);
|
);
|
||||||
assert_approx_eq!(res.total_nanos, 0_f64);
|
assert_approx_eq!(res.total_nanos, 0_f64);
|
||||||
assert_eq!(res.part_1.is_none(), true);
|
assert_eq!(res.part_1.is_none(), true);
|
||||||
|
|
|
@ -105,24 +105,24 @@ pub fn update(timings: Vec<Timings>, total_millis: f64) -> Result<(), Error> {
|
||||||
#[cfg(feature = "test_lib")]
|
#[cfg(feature = "test_lib")]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{update_content, Timings, MARKER};
|
use super::{update_content, Timings, MARKER};
|
||||||
use crate::Day;
|
use crate::day;
|
||||||
|
|
||||||
fn get_mock_timings() -> Vec<Timings> {
|
fn get_mock_timings() -> Vec<Timings> {
|
||||||
vec![
|
vec![
|
||||||
Timings {
|
Timings {
|
||||||
day: Day::new(1).unwrap(),
|
day: day!(1),
|
||||||
part_1: Some("10ms".into()),
|
part_1: Some("10ms".into()),
|
||||||
part_2: Some("20ms".into()),
|
part_2: Some("20ms".into()),
|
||||||
total_nanos: 3e+10,
|
total_nanos: 3e+10,
|
||||||
},
|
},
|
||||||
Timings {
|
Timings {
|
||||||
day: Day::new(2).unwrap(),
|
day: day!(2),
|
||||||
part_1: Some("30ms".into()),
|
part_1: Some("30ms".into()),
|
||||||
part_2: Some("40ms".into()),
|
part_2: Some("40ms".into()),
|
||||||
total_nanos: 7e+10,
|
total_nanos: 7e+10,
|
||||||
},
|
},
|
||||||
Timings {
|
Timings {
|
||||||
day: Day::new(4).unwrap(),
|
day: day!(4),
|
||||||
part_1: Some("40ms".into()),
|
part_1: Some("40ms".into()),
|
||||||
part_2: Some("50ms".into()),
|
part_2: Some("50ms".into()),
|
||||||
total_nanos: 9e+10,
|
total_nanos: 9e+10,
|
||||||
|
|
Loading…
Add table
Reference in a new issue