From 27d88463d2e0add4e7ce135feca301d5706aec0c Mon Sep 17 00:00:00 2001 From: Trey Blancher Date: Thu, 30 Nov 2023 17:08:37 -0500 Subject: [PATCH] Rust upkeep, and adding grand total minutes calculation to timetracker --- rust/timetracking/Cargo.lock | 2 +- rust/timetracking/Cargo.toml | 1 + rust/timetracking/timetracker/Cargo.toml | 2 +- rust/timetracking/timetracker/src/main.rs | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rust/timetracking/Cargo.lock b/rust/timetracking/Cargo.lock index 7f30759..a3ea191 100644 --- a/rust/timetracking/Cargo.lock +++ b/rust/timetracking/Cargo.lock @@ -324,7 +324,7 @@ dependencies = [ [[package]] name = "timetracker" -version = "0.1.0" +version = "0.1.1" dependencies = [ "chrono", "itertools", diff --git a/rust/timetracking/Cargo.toml b/rust/timetracking/Cargo.toml index 4ed9839..067c02f 100644 --- a/rust/timetracking/Cargo.toml +++ b/rust/timetracking/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "timetracker", diff --git a/rust/timetracking/timetracker/Cargo.toml b/rust/timetracking/timetracker/Cargo.toml index afa04ae..4e11b0e 100644 --- a/rust/timetracking/timetracker/Cargo.toml +++ b/rust/timetracking/timetracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "timetracker" -version = "0.1.0" +version = "0.1.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust/timetracking/timetracker/src/main.rs b/rust/timetracking/timetracker/src/main.rs index d38f6ec..df1553d 100644 --- a/rust/timetracking/timetracker/src/main.rs +++ b/rust/timetracking/timetracker/src/main.rs @@ -31,5 +31,6 @@ fn main() { println!(); - println!("{}", format!("Grand total: {:.2}", gtoth)); + let gtotm: f64 = nearest((gtoth * 60.00) as f64); + println!("{}", format!("Grand total: {:.2}hrs ({:.0} minutes)", gtoth, gtotm)); }