updating dependencies (#5028)

* updated docopt, env_logger, semver and regex crates * updated parking_lot to 0.4 * fixed compiling on linux * updated igd to 0.6 * updated jsonrpc * fixed regex related compiler error on linux
openethereum · Mar 28, 2017 · 64c0986 · 64c0986
1 parent 843d959
commit 64c0986
Show file tree

Hide file tree

Showing 26 changed files with 148 additions and 196 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,16 +8,16 @@ build = "build.rs"
 
 [dependencies]
 log = "0.3"
-env_logger = "0.3"
+env_logger = "0.4"
 rustc-serialize = "0.3"
-docopt = "0.6"
+docopt = "0.7"
 time = "0.1"
 num_cpus = "1.2"
 number_prefix = "0.2"
 rpassword = "0.2.1"
-semver = "0.5"
+semver = "0.6"
 ansi_term = "0.9"
-regex = "0.1"
+regex = "0.2"
 isatty = "0.1"
 toml = "0.2"
 serde = "0.9"

diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
@@ -9,7 +9,7 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 base32 = "0.3"
-env_logger = "0.3"
+env_logger = "0.4"
 futures = "0.1"
 linked-hash-map = "0.3"
 log = "0.3"

diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml
@@ -9,4 +9,4 @@ authors = ["Parity Technologies <[email protected]>"]
 log = "0.3"
 sha3 = { path = "../util/sha3" }
 primal = "0.2.3"
-parking_lot = "0.3"
+parking_lot = "0.4"
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -12,14 +12,14 @@ build = "build.rs"
 
 [dependencies]
 log = "0.3"
-env_logger = "0.3"
+env_logger = "0.4"
 rustc-serialize = "0.3"
 rust-crypto = "0.2.34"
 num_cpus = "1.2"
 crossbeam = "0.2.9"
 lazy_static = "0.2"
 bloomchain = "0.1"
-semver = "0.5"
+semver = "0.6"
 bit-set = "0.4"
 time = "0.1"
 rand = "0.3"

diff --git a/ethkey/Cargo.toml b/ethkey/Cargo.toml
@@ -9,7 +9,7 @@ lazy_static = "0.2"
 tiny-keccak = "1.0"
 eth-secp256k1 = { git = "https://github.com/ethcore/rust-secp256k1" }
 rustc-serialize = "0.3"
-docopt = { version = "0.6", optional = true }
+docopt = { version = "0.7", optional = true }
 ethcore-bigint = { path = "../util/bigint" }
 rust-crypto = "0.2"
 byteorder = "1.0"

diff --git a/ethstore/Cargo.toml b/ethstore/Cargo.toml
@@ -14,11 +14,11 @@ serde_derive = "0.9"
 rustc-serialize = "0.3"
 rust-crypto = "0.2.36"
 tiny-keccak = "1.0"
-docopt = { version = "0.6", optional = true }
+docopt = { version = "0.7", optional = true }
 time = "0.1.34"
 lazy_static = "0.2"
 itertools = "0.5"
-parking_lot = "0.3"
+parking_lot = "0.4"
 ethcrypto = { path = "../ethcrypto" }
 ethcore-util = { path = "../util" }
 smallvec = "0.3.1"

diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml
@@ -14,7 +14,7 @@ path = "./src/main.rs"
 
 [dependencies]
 rustc-serialize = "0.3"
-docopt = { version = "0.6" }
+docopt = { version = "0.7" }
 ethcore = { path = "../ethcore" }
 ethcore-util = { path = "../util" }
 

diff --git a/hw/Cargo.toml b/hw/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 log = "0.3"
-parking_lot = "0.3"
+parking_lot = "0.4"
 hidapi = { git = "https://github.com/ethcore/hidapi-rs" }
 libusb = { git = "https://github.com/ethcore/libusb-rs" }
 ethkey = { path = "../ethkey" }

diff --git a/ipc-common-types/Cargo.toml b/ipc-common-types/Cargo.toml
@@ -10,7 +10,7 @@ build = "build.rs"
 ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
-semver = "0.5"
+semver = "0.6"
 ethcore-ipc = { path = "../ipc/rpc" }
 ethcore-util = { path = "../util" }
 

diff --git a/ipc/hypervisor/Cargo.toml b/ipc/hypervisor/Cargo.toml
@@ -11,7 +11,7 @@ build = "build.rs"
 ethcore-ipc = { path = "../rpc" }
 nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
 ethcore-ipc-nano = { path = "../nano" }
-semver = "0.5"
+semver = "0.6"
 log = "0.3"
 time = "0.1"
 

diff --git a/ipc/rpc/Cargo.toml b/ipc/rpc/Cargo.toml
@@ -10,4 +10,4 @@ license = "GPL-3.0"
 ethcore-devtools = { path = "../../devtools" }
 nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
 ethcore-util = { path = "../../util" }
-semver = "0.5"
+semver = "0.6"
diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml
@@ -10,7 +10,7 @@ path = "run.rs"
 [dependencies]
 ethcore-ipc = { path = "../rpc" }
 ethcore-devtools = { path = "../../devtools" }
-semver = "0.5"
+semver = "0.6"
 nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
 ethcore-ipc-nano = { path = "../nano" }
 ethcore-util = { path = "../../util" }

diff --git a/logger/Cargo.toml b/logger/Cargo.toml
@@ -7,12 +7,12 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 log = "0.3"
-env_logger = "0.3"
+env_logger = "0.4"
 isatty = "0.1"
 lazy_static = "0.2"
-regex = "0.1"
+regex = "0.2"
 time = "0.1"
-parking_lot = "0.3"
+parking_lot = "0.4"
 arrayvec = "0.3"
 ansi_term = "0.9"
 

diff --git a/logger/src/lib.rs b/logger/src/lib.rs
@@ -146,7 +146,7 @@ fn kill_color(s: &str) -> String {
 	lazy_static! {
 		static ref RE: Regex = Regex::new("\x1b\\[[^m]+m").unwrap();
 	}
-	RE.replace_all(s, "")
+	RE.replace_all(s, "").to_string()
 }
 
 #[test]

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.1"
 log = "0.3"
 order-stat = "0.1"
 rustc-serialize = "0.3"
-semver = "0.5"
+semver = "0.6"
 serde = "0.9"
 serde_derive = "0.9"
 serde_json = "0.9"

diff --git a/rpc/rpctest/Cargo.toml b/rpc/rpctest/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
-docopt = "0.6"
+docopt = "0.7"
 rustc-serialize = "0.3"
 ethcore = { path = "../../ethcore" }
 ethcore-devtools = { path = "../../devtools" }

diff --git a/secret_store/Cargo.toml b/secret_store/Cargo.toml
@@ -11,7 +11,7 @@ ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
 log = "0.3"
-parking_lot = "0.3"
+parking_lot = "0.4"
 hyper = { version = "0.10", default-features = false }
 url = "1.0"
 ethcore-devtools = { path = "../devtools" }

diff --git a/signer/Cargo.toml b/signer/Cargo.toml
@@ -15,7 +15,7 @@ rand = "0.3.14"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-server-utils = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 log = "0.3"
-env_logger = "0.3"
+env_logger = "0.4"
 ws = { git = "https://github.com/paritytech/ws-rs.git", branch = "mio-upstream-stable" }
 parity-dapps-glue = { version = "1.7", optional = true }
 ethcore-util = { path = "../util" }

diff --git a/stratum/Cargo.toml b/stratum/Cargo.toml
@@ -17,9 +17,9 @@ jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch
 ethcore-util = { path = "../util" }
 ethcore-devtools = { path = "../devtools" }
 lazy_static = "0.2"
-env_logger = "0.3"
+env_logger = "0.4"
 ethcore-ipc = { path = "../ipc/rpc" }
-semver = "0.5"
+semver = "0.6"
 ethcore-ipc-nano = { path = "../ipc/nano" }
 futures = "0.1"
 tokio-core = "0.1"

diff --git a/sync/Cargo.toml b/sync/Cargo.toml
@@ -20,16 +20,16 @@ ethcore = { path = "../ethcore" }
 rlp = { path = "../util/rlp" }
 clippy = { version = "0.0.103", optional = true}
 log = "0.3"
-env_logger = "0.3"
+env_logger = "0.4"
 time = "0.1.34"
 rand = "0.3.13"
 heapsize = "0.3"
 ethcore-ipc = { path = "../ipc/rpc" }
-semver = "0.5"
+semver = "0.6"
 ethcore-ipc-nano = { path = "../ipc/nano" }
 ethcore-devtools = { path = "../devtools" }
 ethkey = { path = "../ethkey" }
-parking_lot = "0.3"
+parking_lot = "0.4"
 
 [features]
 default = []

diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -9,7 +9,7 @@ build = "build.rs"
 
 [dependencies]
 log = "0.3"
-env_logger = "0.3"
+env_logger = "0.4"
 rustc-serialize = "0.3"
 rand = "0.3.12"
 time = "0.1.34"
@@ -27,13 +27,13 @@ libc = "0.2.7"
 vergen = "0.1"
 target_info = "0.1"
 ethcore-bigint = { path = "bigint" }
-parking_lot = "0.3"
+parking_lot = "0.4"
 using_queue = { path = "using_queue" }
 table = { path = "table" }
 ansi_term = "0.9"
 tiny-keccak= "1.0"
 ethcore-bloom-journal = { path = "bloom" }
-regex = "0.1"
+regex = "0.2"
 lru-cache = "0.1.0"
 ethcore-logger = { path = "../logger" }
 

diff --git a/util/fetch/Cargo.toml b/util/fetch/Cargo.toml
@@ -9,7 +9,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 futures = "0.1"
 futures-cpupool = "0.1"
-parking_lot = "0.3"
+parking_lot = "0.4"
 log = "0.3"
 reqwest = "0.4"
 mime = "0.2"

diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml
@@ -9,7 +9,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 mio = { git = "https://github.com/ethcore/mio" }
 crossbeam = "0.2"
-parking_lot = "0.3"
+parking_lot = "0.4"
 log = "0.3"
 slab = "0.2"
 
diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml
@@ -16,9 +16,9 @@ tiny-keccak = "1.0"
 rust-crypto = "0.2.34"
 slab = "0.2"
 clippy = { version = "0.0.103", optional = true}
-igd = "0.5.0"
+igd = "0.6"
 libc = "0.2.7"
-parking_lot = "0.3"
+parking_lot = "0.4"
 ansi_term = "0.9"
 rustc-serialize = "0.3"
 ethcore-io = { path = "../io" }

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
@@ -283,11 +283,11 @@ pub fn rotational_from_df_output(df_out: Vec<u8>) -> Option<PathBuf> {
 		.and_then(|df_str| Regex::new(r"/dev/(sd[:alpha:]{1,2})")
 			.ok()
 			.and_then(|re| re.captures(df_str))
-			.and_then(|captures| captures.at(1)))
+			.and_then(|captures| captures.get(1)))
 		// Generate path e.g. /sys/block/sda/queue/rotational
 		.map(|drive_path| {
 			let mut p = PathBuf::from("/sys/block");
-			p.push(drive_path);
+			p.push(drive_path.as_str());
 			p.push("queue/rotational");
 			p
 		})