From 1887080990428cd655481fce51809761da8a5705 Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Thu, 27 Jun 2019 19:34:40 +0800 Subject: [PATCH] updated project to ansi_term 0.11 (#10799) --- Cargo.lock | 23 ++++++++--------------- Cargo.toml | 2 +- ethcore/Cargo.toml | 2 +- ethcore/blockchain/Cargo.toml | 2 +- ethcore/service/Cargo.toml | 3 +-- ethcore/service/src/lib.rs | 1 - miner/Cargo.toml | 2 +- parity/logger/Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- util/network-devp2p/Cargo.toml | 2 +- 10 files changed, 16 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83d8a543b..b12b997d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,11 +49,6 @@ dependencies = [ "memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ansi_term" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "ansi_term" version = "0.11.0" @@ -864,7 +859,7 @@ dependencies = [ name = "ethcore" version = "1.12.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "blooms-db 0.1.0", "bn 0.4.4 (git+https://github.com/paritytech/bn)", "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -956,7 +951,7 @@ dependencies = [ name = "ethcore-blockchain" version = "0.1.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "blooms-db 0.1.0", "common-types 0.1.0", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1074,7 +1069,7 @@ dependencies = [ name = "ethcore-logger" version = "1.12.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1089,7 +1084,7 @@ dependencies = [ name = "ethcore-miner" version = "1.12.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "common-types 0.1.0", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1144,7 +1139,7 @@ dependencies = [ name = "ethcore-network-devp2p" version = "1.12.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1259,8 +1254,7 @@ dependencies = [ name = "ethcore-service" version = "0.1.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", "ethcore-blockchain 0.1.0", "ethcore-db 0.1.0", @@ -2680,7 +2674,7 @@ dependencies = [ name = "parity-ethereum" version = "2.6.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "blooms-db 0.1.0", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2836,7 +2830,7 @@ dependencies = [ name = "parity-rpc" version = "1.12.0" dependencies = [ - "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "cid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "common-types 0.1.0", "eip-712 0.1.0", @@ -4722,7 +4716,6 @@ dependencies = [ "checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" "checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" "checksum aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a" -"checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum app_dirs 1.2.1 (git+https://github.com/paritytech/app-dirs-rs)" = "" "checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" diff --git a/Cargo.toml b/Cargo.toml index 39a9bbd36..764a2d30d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ num_cpus = "1.2" number_prefix = "0.2" rpassword = "1.0" semver = "0.9" -ansi_term = "0.10" +ansi_term = "0.11" parking_lot = "0.7" regex = "1.0" atty = "0.2.8" diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index f7355da85..b35bad357 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -7,7 +7,7 @@ version = "1.12.0" authors = ["Parity Technologies "] [dependencies] -ansi_term = "0.10" +ansi_term = "0.11" blooms-db = { path = "../util/blooms-db", optional = true } bn = { git = "https://github.com/paritytech/bn", default-features = false } byteorder = "1.0" diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml index 7b9f72778..88fbdebc1 100644 --- a/ethcore/blockchain/Cargo.toml +++ b/ethcore/blockchain/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -ansi_term = "0.10" +ansi_term = "0.11" blooms-db = { path = "../../util/blooms-db" } common-types = { path = "../types" } ethcore-db = { path = "../db" } diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml index fe6f7c46c..ab62cb1ba 100644 --- a/ethcore/service/Cargo.toml +++ b/ethcore/service/Cargo.toml @@ -5,8 +5,7 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -ansi_term = "0.10" -derive_more = "0.14.0" +ansi_term = "0.11" ethcore = { path = ".." } ethcore-blockchain = { path = "../blockchain" } ethcore-io = { path = "../../util/io" } diff --git a/ethcore/service/src/lib.rs b/ethcore/service/src/lib.rs index f5d92f35e..f9a4da5e4 100644 --- a/ethcore/service/src/lib.rs +++ b/ethcore/service/src/lib.rs @@ -23,7 +23,6 @@ extern crate ethcore_sync as sync; extern crate ethereum_types; extern crate kvdb; -extern crate derive_more; #[macro_use] extern crate log; #[macro_use] diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 13a819930..2cbbf14a1 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -14,7 +14,7 @@ hyper = { version = "0.12", optional = true } url = { version = "1", optional = true } # Miner -ansi_term = "0.10" +ansi_term = "0.11" common-types = { path = "../ethcore/types" } error-chain = "0.12" ethabi = "8.0" diff --git a/parity/logger/Cargo.toml b/parity/logger/Cargo.toml index 217bcf48a..6ce90ce97 100644 --- a/parity/logger/Cargo.toml +++ b/parity/logger/Cargo.toml @@ -14,4 +14,4 @@ regex = "1.0" time = "0.1" parking_lot = "0.7" arrayvec = "0.4" -ansi_term = "0.10" +ansi_term = "0.11" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 7044128d6..7ba7b4fca 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Parity Technologies "] [lib] [dependencies] -ansi_term = "0.10" +ansi_term = "0.11" cid = "0.3" futures = "0.1.6" log = "0.4" diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml index 48887b4ef..96796f668 100644 --- a/util/network-devp2p/Cargo.toml +++ b/util/network-devp2p/Cargo.toml @@ -17,7 +17,7 @@ slab = "0.2" igd = "0.9" libc = "0.2.7" parking_lot = "0.7" -ansi_term = "0.10" +ansi_term = "0.11" rustc-hex = "1.0" ethcore-io = { path = "../io", features = ["mio"] } parity-bytes = "0.1"