From 750d0f13da3fae0f5e4b6eb530da2e366fad4b1f Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 17 Oct 2023 12:06:35 +0800 Subject: [PATCH 1/2] Upgrade env-logger to 0.10 --- util/logger-service/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index 5ab3bebea9..dc5108e200 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -14,7 +14,7 @@ ckb-logger-config = { path = "../logger-config", version = "= 0.113.0-pre" } ckb-channel = { path = "../channel", version = "= 0.113.0-pre" } yansi = "0.5" log = "0.4" -env_logger = "0.6" +env_logger = "0.10" once_cell = "1.8.0" regex = "1.1.6" backtrace = "0.3" From 9036eac655794720961f8b6d80990c6d859b5813 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 17 Oct 2023 12:07:40 +0800 Subject: [PATCH 2/2] Execute `make prod` to remove `atty` from `Cargo.lock` --- Cargo.lock | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d868075418..da8e54c00f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,17 +155,6 @@ dependencies = [ "wildmatch", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -2038,12 +2027,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.6.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -2484,15 +2473,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.3" @@ -2570,12 +2550,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" @@ -2767,7 +2744,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "rustix", "windows-sys 0.48.0", ] @@ -3259,7 +3236,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", ]