From 464ffc0c0819c14a2554280ce479fe9822c40b46 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 30 Jan 2023 15:07:33 +0100 Subject: [PATCH 1/2] Fix pretty table crash by bumping version --- Cargo.lock | 98 +++++++++----------------------------------- golem_cli/Cargo.toml | 2 +- utils/cli/Cargo.toml | 2 +- 3 files changed, 22 insertions(+), 80 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f9fe9d9679..f18c234376 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -791,17 +791,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - [[package]] name = "blake2s_const" version = "0.6.0" @@ -1732,17 +1721,6 @@ dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi 0.3.9", -] - [[package]] name = "dirs-next" version = "1.0.2" @@ -1770,7 +1748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi 0.3.9", ] @@ -1781,7 +1759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi 0.3.9", ] @@ -2546,7 +2524,7 @@ dependencies = [ "log", "names", "nix 0.22.3", - "prettytable-rs 0.8.0", + "prettytable-rs", "promptly", "rustyline 6.3.0", "serde", @@ -3126,6 +3104,18 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys", +] + [[package]] name = "itertools" version = "0.9.0" @@ -4583,29 +4573,15 @@ dependencies = [ [[package]] name = "prettytable-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" -dependencies = [ - "atty", - "csv", - "encode_unicode 0.3.6", - "lazy_static", - "term 0.5.2", - "unicode-width", -] - -[[package]] -name = "prettytable-rs" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f375cb74c23b51d23937ffdeb48b1fbf5b6409d4b9979c1418c1de58bc8f801" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" dependencies = [ - "atty", "csv", "encode_unicode 1.0.0", + "is-terminal", "lazy_static", - "term 0.7.0", + "term", "unicode-width", ] @@ -5145,17 +5121,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.3" @@ -5333,18 +5298,6 @@ dependencies = [ "winapi 0.2.8", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.1", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.14", -] - [[package]] name = "rustc-demangle" version = "0.1.21" @@ -6351,17 +6304,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs", - "winapi 0.3.9", -] - [[package]] name = "term" version = "0.7.0" @@ -8550,7 +8492,7 @@ version = "0.1.0" dependencies = [ "anyhow", "lazy_static", - "prettytable-rs 0.9.0", + "prettytable-rs", "serde", "serde_json", "serde_yaml 0.9.16", diff --git a/golem_cli/Cargo.toml b/golem_cli/Cargo.toml index faeb44212a..b9029c9103 100644 --- a/golem_cli/Cargo.toml +++ b/golem_cli/Cargo.toml @@ -27,7 +27,7 @@ futures = "0.3" lazy_static = "1.4" log = "0.4" names = "0.10.0" -prettytable-rs = "0.8.0" +prettytable-rs = "0.10.0" promptly = "0.3.0" rustyline="6.3.0" serde = { version = "1.0", features = ["derive"] } diff --git a/utils/cli/Cargo.toml b/utils/cli/Cargo.toml index 6278eeb600..1a0c364f4c 100644 --- a/utils/cli/Cargo.toml +++ b/utils/cli/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["golem", "yagna"] [dependencies] anyhow = "1.0" -prettytable-rs = "0.9" +prettytable-rs = "0.10.0" serde = "1.0" serde_json = "1.0" serde_yaml = "0.9" From 1559f3d668ef90265f3f70241aea8c3ade7013c0 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 30 Jan 2023 16:19:29 +0100 Subject: [PATCH 2/2] Fix warning --- golem_cli/src/status.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golem_cli/src/status.rs b/golem_cli/src/status.rs index 5d3b0ef142..3b6eef744c 100644 --- a/golem_cli/src/status.rs +++ b/golem_cli/src/status.rs @@ -4,7 +4,7 @@ use ansi_term::{Colour, Style}; use anyhow::{anyhow, Result}; use bigdecimal::BigDecimal; use futures::prelude::*; -use prettytable::{cell, format, row, Table}; +use prettytable::{format, row, Table}; use strum::VariantNames; use ya_core_model::payment::local::{NetworkName, StatusResult};