From d84ae448e5dfcdcead0d219e2ace8426a5527baf Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 23 Aug 2024 13:11:11 -0300 Subject: [PATCH] fix(cli): downgrade env_logger to 0.10 to satisfy MSRV, fix CI --- .../covector-version-or-publish-v1.yml | 2 +- tooling/cli/Cargo.lock | 50 ++++++++++++------- tooling/cli/Cargo.toml | 2 +- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.github/workflows/covector-version-or-publish-v1.yml b/.github/workflows/covector-version-or-publish-v1.yml index 04806974f..770f4487f 100644 --- a/.github/workflows/covector-version-or-publish-v1.yml +++ b/.github/workflows/covector-version-or-publish-v1.yml @@ -126,7 +126,7 @@ jobs: cargo update -p tokio-stream --precise 0.1.14 cargo update -p tokio-util --precise 0.7.10 cargo update -p os_pipe --precise 1.1.5 - cargo update -p syn:2.0.72 --precise 2.0.67 + cargo update -p syn:2.0.75 --precise 2.0.67 cargo update -p derive_more --precise 0.99.17 cargo update -p native-tls --precise 0.2.11 cargo update -p ppv-lite86 --precise 0.2.17 diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 0853ba538..2ce03cec6 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -1211,26 +1211,16 @@ dependencies = [ ] [[package]] -name = "env_filter" -version = "0.1.2" +name = "env_logger" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ + "humantime", + "is-terminal", "log", "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", + "termcolor", ] [[package]] @@ -1605,6 +1595,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1922,6 +1918,17 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -2333,7 +2340,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", @@ -4460,6 +4467,15 @@ dependencies = [ "utf-8", ] +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "thin-slice" version = "0.1.1" diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 6c6b117c4..c8538cd9a 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -72,7 +72,7 @@ os_pipe = "1" ignore = "0.4" ctrlc = "3.4" log = { version = "0.4.21", features = [ "kv", "kv_std" ] } -env_logger = "0.11.0" +env_logger = "0.10.0" icns = { package = "tauri-icns", version = "0.1" } image = { version = "0.25", default-features = false, features = [ "ico" ] } axum = { version = "0.7.0", features = [ "ws" ] }