From 4e42ee6d65c8a0d0d5513265b17309e810fe518d Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 24 Mar 2025 10:39:43 -0700 Subject: [PATCH 1/3] Update time to pull in deranged 0.4 Generated by `cargo update -p time` --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 425abdf..7a4fd42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -368,9 +368,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" dependencies = [ "powerfmt", ] @@ -965,9 +965,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.39" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -980,15 +980,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", From c8b37ee49d183a394e30714b2ca5f203add7597c Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 24 Mar 2025 10:40:12 -0700 Subject: [PATCH 2/3] Disallow deranged 0.4.1 until either deranged or plist is fixed --- Cargo.lock | 5 +++-- Cargo.toml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a4fd42..93f16a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,6 +201,7 @@ dependencies = [ "clap", "clap-cargo", "console", + "deranged", "fs-err", "home", "prettyplease", @@ -368,9 +369,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] diff --git a/Cargo.toml b/Cargo.toml index b06cd22..d1690e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,6 +40,9 @@ toolchain_find = "0.4" [target.'cfg(all(windows, not(target_vendor = "uwp")))'.dependencies] windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_System_Com", "Win32_UI_Shell"] } +[target.'cfg(target_os = "macos")'.dependencies] +deranged = "=0.4.0" # https://github.com/jhpratt/deranged/issues/18 + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] From 12a0d5320e46c2d28b2c1691b4c3f7a23c17375b Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 24 Mar 2025 10:41:53 -0700 Subject: [PATCH 3/3] Disregard outdated deranged crate --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ac2e71..dd3ea54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,4 +85,4 @@ jobs: - uses: dtolnay/install@cargo-outdated - run: cargo tree --package bat --depth 0 | grep "^bat v$(cat src/bat.version)$" - run: cargo update - - run: cargo outdated --workspace --exit-code 1 + - run: cargo outdated --workspace --ignore deranged --exit-code 1