From bfa40fd8f1daf8eaa50212e7a4602b7317a26312 Mon Sep 17 00:00:00 2001 From: Jens Krause <47693+sectore@users.noreply.github.com> Date: Sat, 28 Jun 2025 11:39:22 +0200 Subject: [PATCH] Rust 1.88.0 (#85) * Rust 1.88.0 * nix flake update * cargo upgrade * lint all `uninlined_format_args` related @see https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args --- CHANGELOG.md | 2 +- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 4 ++-- flake.lock | 24 ++++++++++++------------ flake.nix | 2 +- rust-toolchain.toml | 2 +- src/app.rs | 2 +- src/widgets/countdown.rs | 2 +- src/widgets/footer.rs | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1238513..5d4507b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ ### Misc. -- (deps) Rust 1.87.0 [#84](https://github.com/sectore/timr-tui/pull/84) +- (deps) Rust 1.88.0 [#85](https://github.com/sectore/timr-tui/pull/85) ## v1.3.0 - 2025-05-06 diff --git a/Cargo.lock b/Cargo.lock index 71bbc45..c53bfde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.39" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" +checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" dependencies = [ "clap_builder", "clap_derive", @@ -419,9 +419,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.39" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" +checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" dependencies = [ "anstream", "anstyle", @@ -431,9 +431,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.32" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" dependencies = [ "heck", "proc-macro2", @@ -731,7 +731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1687,7 +1687,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1700,7 +1700,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1994,7 +1994,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.0.7", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2431,7 +2431,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0fc2ace..441f4aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "1.3.0" description = "TUI to organize your time: Pomodoro, Countdown, Timer." edition = "2024" # Reminder: Always keep `channel` in `rust-toolchain.toml` in sync with `rust-version`. -rust-version = "1.87.0" +rust-version = "1.88.0" homepage = "https://github.com/sectore/timr-tui" repository = "https://github.com/sectore/timr-tui" readme = "README.md" @@ -27,7 +27,7 @@ tokio-util = "0.7.15" tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } directories = "5.0.1" -clap = { version = "4.5.39", features = ["derive"] } +clap = { version = "4.5.40", features = ["derive"] } time = { version = "0.3.41", features = ["formatting", "local-offset"] } notify-rust = "4.11.7" rodio = { version = "0.20.1", features = [ diff --git a/flake.lock b/flake.lock index 3e799d2..1f8fb7c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1748970125, - "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "owner": "ipetkov", "repo": "crane", - "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1749451322, - "narHash": "sha256-t53R3kSDl4Jie+Ooxi/aQFN2ODRp1tXQSJBevOt3IkQ=", + "lastModified": 1751092526, + "narHash": "sha256-vmbu97JXqr9/sTWR5XRh646jkp8a0J9m0o6JIQTdjE4=", "owner": "nix-community", "repo": "fenix", - "rev": "77de5067629e201436c76f14f96614a19368c4ae", + "rev": "6643d56d9a78afa157b577862c220298c09b891d", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1749419176, - "narHash": "sha256-Hs0vidgwvBiBuqNjR5oCQMMGUfUYwwnyxLShg3yzhWU=", + "lastModified": 1750871759, + "narHash": "sha256-hMNZXMtlhfjQdu1F4Fa/UFiMoXdZag4cider2R9a648=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9fc1b9076cf49c7f54497df9cfa4485a63f14d3e", + "rev": "317542c1e4a3ec3467d21d1c25f6a43b80d83e7d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ddc1f79..22f0594 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ { file = ./rust-toolchain.toml; # sha256 = nixpkgs.lib.fakeSha256; - sha256 = "sha256-KUm16pHj+cRedf8vxs/Hd2YWxpOrWZ7UOrwhILdSJBU="; + sha256 = "sha256-Qxt8XAuaUR2OMdKbN4u8dBJOhSHxS+uS06Wl9+flVEk="; }; craneLib = (crane.mkLib pkgs).overrideToolchain toolchain; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3d28492..18095f5 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] # Reminder: Always keep `rust-version` in `Cargo.toml` in sync with `channel`. -channel = "1.87.0" +channel = "1.88.0" components = ["clippy", "rustfmt", "rust-src", "rust-analyzer"] targets = ["x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl"] profile = "minimal" diff --git a/src/app.rs b/src/app.rs index fa5f3e5..8591020 100644 --- a/src/app.rs +++ b/src/app.rs @@ -276,7 +276,7 @@ impl App { ClockTypeId::Timer => { format!("{name} stopped by reaching its maximum value.") } - _ => format!("{:?} {name} done!", type_id), + _ => format!("{type_id:?} {name} done!"), }; // notification let result = notify_rust::Notification::new() diff --git a/src/widgets/countdown.rs b/src/widgets/countdown.rs index 181dca7..3e31897 100644 --- a/src/widgets/countdown.rs +++ b/src/widgets/countdown.rs @@ -319,7 +319,7 @@ fn human_days_diff(a: &OffsetDateTime, b: &OffsetDateTime) -> String { match days_diff { 0 => "today".to_owned(), 1 => "tomorrow".to_owned(), - n => format!("+{}days", n), + n => format!("+{n}days"), } } diff --git a/src/widgets/footer.rs b/src/widgets/footer.rs index c36e371..988157f 100644 --- a/src/widgets/footer.rs +++ b/src/widgets/footer.rs @@ -89,7 +89,7 @@ impl StatefulWidget for Footer { let mut style = Style::default(); // Add space for all except last let label = if index < content_labels.len() - 1 { - format!("{} ", label) + format!("{label} ") } else { label.to_string() };