From 94350f0959e22b4cff2f518c2a0778895d34a22a Mon Sep 17 00:00:00 2001 From: Illia Bobyr Date: Thu, 20 Apr 2023 19:37:36 -0700 Subject: [PATCH] Revert: Bump console from 0.15.0 to 0.15.5 (#31289) (#31294) commit 4e3300e7d66a12d4fd377704d1b5c202897d08eb Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Apr 20 15:40:14 2023 -0700 Bump console from 0.15.0 to 0.15.5 (#31289) Bumps [console](https://github.com/console-rs/console) from 0.15.0 to 0.15.5. - [Release notes](https://github.com/console-rs/console/releases) - [Changelog](https://github.com/console-rs/console/blob/master/CHANGELOG.md) - [Commits](console-rs/console@0.15.0...0.15.5) --- updated-dependencies: - dependency-name: console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Windows build is broken with the following error: Compiling solana-genesis-utils v1.16.0 (D:\a\solana\solana\genesis-utils) error[E0432]: unresolved import `winapi::um::winuser` --> install\src\command.rs:385:17 | 385 | um::winuser::{ | ^^^^^^^ could not find `winuser` in `um` For more information about this error, try `rustc --explain E0432`. https://github.com/solana-labs/solana/actions/runs/4759519915/jobs/8458877323 --- Cargo.lock | 20 ++++++++++++++++---- Cargo.toml | 2 +- programs/sbf/Cargo.lock | 20 ++++++++++++++++---- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77bab5030..81e2ced21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,15 +1103,17 @@ dependencies = [ [[package]] name = "console" -version = "0.15.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" dependencies = [ "encode_unicode", - "lazy_static", "libc", + "once_cell", + "regex", + "terminal_size", "unicode-width", - "windows-sys 0.42.0", + "winapi 0.3.9", ] [[package]] @@ -7722,6 +7724,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "termtree" version = "0.2.3" diff --git a/Cargo.toml b/Cargo.toml index 988e9cdb1..e6838bbe4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -159,7 +159,7 @@ cc = "1.0.79" chrono = { version = "0.4.24", default-features = false } chrono-humanize = "0.2.2" clap = "2.33.1" -console = "0.15.5" +console = "0.15.0" console_error_panic_hook = "0.1.7" console_log = "0.2.0" const_format = "0.2.30" diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 8e64aed04..18c7b130e 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -993,15 +993,17 @@ dependencies = [ [[package]] name = "console" -version = "0.15.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" dependencies = [ "encode_unicode", - "lazy_static", "libc", + "once_cell", + "regex", + "terminal_size", "unicode-width", - "windows-sys 0.42.0", + "winapi 0.3.9", ] [[package]] @@ -6840,6 +6842,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "textwrap" version = "0.11.0"