From 127b9bec15f8a83964ef6049209df75da47b1479 Mon Sep 17 00:00:00 2001
From: maksimryndin <maksim.ryndin@gmail.com>
Date: Sat, 13 Jan 2024 09:53:09 +0100
Subject: [PATCH] wasm-builder: bump toml from 0.8.2 to 0.8.8; replace
ansi_term (#2914)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Hi folks!
Thank for the well organized codebase and an outstanding engineering!
I am trying to compile a substrate node template from source
(https://github.com/paritytech/polkadot-sdk) and encountered a
dependency conflict
and a deprecation warning from advisory db for `ansi_term` (I see you
replace it with some alternatives in other crates).
While for `ansi_term` there is an adopted fork
(https://github.com/rustadopt/ansiterm-rs) and it was my first commit in
the PR, I've decided to use https://github.com/console-rs/console as you
already use it to reduce dependencies (as I believe other substrate
crates will remove ansi_term eventually)
---------
Co-authored-by: Bastian Köcher <git@kchr.de>
---
Cargo.lock | 99 ++++++++++++++-----
substrate/utils/wasm-builder/Cargo.toml | 4 +-
.../utils/wasm-builder/src/prerequisites.rs | 11 +--
.../utils/wasm-builder/src/wasm_project.rs | 3 +-
4 files changed, 86 insertions(+), 31 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 0452f04908f..b20adebf963 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2922,15 +2922,15 @@ dependencies = [
[[package]]
name = "console"
-version = "0.15.7"
+version = "0.15.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
dependencies = [
"encode_unicode",
"lazy_static",
"libc",
"unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -9625,7 +9625,7 @@ dependencies = [
"polkavm-linker",
"sp-runtime",
"tempfile",
- "toml 0.8.2",
+ "toml 0.8.8",
"twox-hash",
"wat",
]
@@ -19632,15 +19632,15 @@ dependencies = [
name = "substrate-wasm-builder"
version = "5.0.0-dev"
dependencies = [
- "ansi_term",
"build-helper",
"cargo_metadata",
+ "console",
"filetime",
"parity-wasm",
"sp-maybe-compressed-blob",
"strum",
"tempfile",
- "toml 0.8.2",
+ "toml 0.8.8",
"walkdir",
"wasm-opt",
]
@@ -20296,14 +20296,14 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.2"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.21.0",
]
[[package]]
@@ -20328,19 +20328,6 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "toml_edit"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
-dependencies = [
- "indexmap 2.0.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
[[package]]
name = "toml_edit"
version = "0.21.0"
@@ -20348,6 +20335,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
dependencies = [
"indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
"toml_datetime",
"winnow",
]
@@ -21710,6 +21699,15 @@ dependencies = [
"windows-targets 0.48.5",
]
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
[[package]]
name = "windows-targets"
version = "0.42.2"
@@ -21740,6 +21738,21 @@ dependencies = [
"windows_x86_64_msvc 0.48.5",
]
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
@@ -21752,6 +21765,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.34.0"
@@ -21770,6 +21789,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
[[package]]
name = "windows_i686_gnu"
version = "0.34.0"
@@ -21788,6 +21813,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
[[package]]
name = "windows_i686_msvc"
version = "0.34.0"
@@ -21806,6 +21837,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.34.0"
@@ -21824,6 +21861,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
@@ -21836,6 +21879,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.34.0"
@@ -21854,6 +21903,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
[[package]]
name = "winnow"
version = "0.5.15"
diff --git a/substrate/utils/wasm-builder/Cargo.toml b/substrate/utils/wasm-builder/Cargo.toml
index 2154cfca177..ffe95994c65 100644
--- a/substrate/utils/wasm-builder/Cargo.toml
+++ b/substrate/utils/wasm-builder/Cargo.toml
@@ -15,12 +15,12 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-ansi_term = "0.12.1"
build-helper = "0.1.1"
cargo_metadata = "0.15.4"
+console = "0.15.8"
strum = { version = "0.24.1", features = ["derive"] }
tempfile = "3.1.0"
-toml = "0.8.2"
+toml = "0.8.8"
walkdir = "2.3.2"
sp-maybe-compressed-blob = { path = "../../primitives/maybe-compressed-blob" }
filetime = "0.2.16"
diff --git a/substrate/utils/wasm-builder/src/prerequisites.rs b/substrate/utils/wasm-builder/src/prerequisites.rs
index 2cdbdd2798e..99eb6ee1f18 100644
--- a/substrate/utils/wasm-builder/src/prerequisites.rs
+++ b/substrate/utils/wasm-builder/src/prerequisites.rs
@@ -17,15 +17,14 @@
use crate::{write_file_if_changed, CargoCommand, CargoCommandVersioned};
+use console::style;
use std::{fs, path::Path};
-
-use ansi_term::Color;
use tempfile::tempdir;
/// Print an error message.
fn print_error_message(message: &str) -> String {
if super::color_output_enabled() {
- Color::Red.bold().paint(message).to_string()
+ style(message).red().bold().to_string()
} else {
message.into()
}
@@ -117,10 +116,10 @@ fn check_wasm_toolchain_installed(
Ok(ref err) => Err(format!(
"{}\n\n{}\n{}\n{}{}\n",
err_msg,
- Color::Yellow.bold().paint("Further error information:"),
- Color::Yellow.bold().paint("-".repeat(60)),
+ style("Further error information:").yellow().bold(),
+ style("-".repeat(60)).yellow().bold(),
err,
- Color::Yellow.bold().paint("-".repeat(60)),
+ style("-".repeat(60)).yellow().bold(),
)),
Err(_) => Err(err_msg),
diff --git a/substrate/utils/wasm-builder/src/wasm_project.rs b/substrate/utils/wasm-builder/src/wasm_project.rs
index 2126a49bd7f..ded6b2188b0 100644
--- a/substrate/utils/wasm-builder/src/wasm_project.rs
+++ b/substrate/utils/wasm-builder/src/wasm_project.rs
@@ -19,6 +19,7 @@ use crate::{write_file_if_changed, CargoCommandVersioned, OFFLINE};
use build_helper::rerun_if_changed;
use cargo_metadata::{DependencyKind, Metadata, MetadataCommand};
+use console::style;
use parity_wasm::elements::{deserialize_buffer, Module};
use std::{
borrow::ToOwned,
@@ -38,7 +39,7 @@ use walkdir::WalkDir;
/// Returns the colorized message.
fn colorize_info_message(message: &str) -> String {
if super::color_output_enabled() {
- ansi_term::Color::Yellow.bold().paint(message).to_string()
+ style(message).yellow().bold().to_string()
} else {
message.into()
}
--
GitLab