From c4aa18568e97aa7aef450f59d6b457f9e8b1c449 Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 12 Jun 2017 15:17:56 +0200 Subject: [PATCH] fix build for rustc 1.16 --- Cargo.lock | 22 +++++++++++----------- ipc/hypervisor/Cargo.toml | 2 +- ipc/nano/Cargo.toml | 2 +- ipc/rpc/Cargo.toml | 2 +- ipc/tests/Cargo.toml | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d8173b23f..98de72e67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -476,7 +476,7 @@ version = "1.5.0" dependencies = [ "ethcore-devtools 1.5.0", "ethcore-util 1.5.13", - "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)", + "nanomsg 0.7.0 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5)", "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -499,7 +499,7 @@ dependencies = [ "ethcore-ipc-codegen 1.5.0", "ethcore-ipc-nano 1.5.0", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)", + "nanomsg 0.7.0 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5)", "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -511,7 +511,7 @@ dependencies = [ "ethcore-ipc 1.5.0", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)", + "nanomsg 0.7.0 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5)", ] [[package]] @@ -524,7 +524,7 @@ dependencies = [ "ethcore-ipc-nano 1.5.0", "ethcore-util 1.5.13", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)", + "nanomsg 0.7.0 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5)", "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1296,17 +1296,17 @@ dependencies = [ [[package]] name = "nanomsg" -version = "0.5.1" -source = "git+https://github.com/ethcore/nanomsg.rs.git#c40fe442c9afaea5b38009a3d992ca044dcceb00" +version = "0.7.0" +source = "git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5#f94f2d4289d123e16a0c928f3e513533b282a8a2" dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg-sys 0.5.0 (git+https://github.com/ethcore/nanomsg.rs.git)", + "nanomsg-sys 0.7.0 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5)", ] [[package]] name = "nanomsg-sys" -version = "0.5.0" -source = "git+https://github.com/ethcore/nanomsg.rs.git#c40fe442c9afaea5b38009a3d992ca044dcceb00" +version = "0.7.0" +source = "git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5#f94f2d4289d123e16a0c928f3e513533b282a8a2" dependencies = [ "gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2558,8 +2558,8 @@ dependencies = [ "checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04b68cc63a8480fb2550343695f7be72effdec953a9d4508161c3e69041c7d8" -"checksum nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)" = "" -"checksum nanomsg-sys 0.5.0 (git+https://github.com/ethcore/nanomsg.rs.git)" = "" +"checksum nanomsg 0.7.0 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5)" = "" +"checksum nanomsg-sys 0.7.0 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.5)" = "" "checksum native-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4e52995154bb6f0b41e4379a279482c9387c1632e3798ba4e511ef8c54ee09" "checksum net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "bc01404e7568680f1259aa5729539f221cb1e6d047a0d9053cab4be8a73b5d67" "checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79" diff --git a/ipc/hypervisor/Cargo.toml b/ipc/hypervisor/Cargo.toml index 21955bdf3..6e12e5758 100644 --- a/ipc/hypervisor/Cargo.toml +++ b/ipc/hypervisor/Cargo.toml @@ -9,7 +9,7 @@ build = "build.rs" [dependencies] ethcore-ipc = { path = "../rpc" } -nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" } +nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch="parity-1.5" } ethcore-ipc-nano = { path = "../nano" } semver = "0.5" log = "0.3" diff --git a/ipc/nano/Cargo.toml b/ipc/nano/Cargo.toml index 7d559dbab..979ce30f5 100644 --- a/ipc/nano/Cargo.toml +++ b/ipc/nano/Cargo.toml @@ -8,6 +8,6 @@ license = "GPL-3.0" [dependencies] ethcore-ipc = { path = "../rpc" } -nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" } +nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch="parity-1.5" } log = "0.3" lazy_static = "0.2" diff --git a/ipc/rpc/Cargo.toml b/ipc/rpc/Cargo.toml index a89d1a9ee..3b293ff8f 100644 --- a/ipc/rpc/Cargo.toml +++ b/ipc/rpc/Cargo.toml @@ -8,6 +8,6 @@ license = "GPL-3.0" [dependencies] ethcore-devtools = { path = "../../devtools" } -nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" } +nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch="parity-1.5" } ethcore-util = { path = "../../util" } semver = "0.5" diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml index 1e29c5c35..9bbb4a011 100644 --- a/ipc/tests/Cargo.toml +++ b/ipc/tests/Cargo.toml @@ -11,7 +11,7 @@ path = "run.rs" ethcore-ipc = { path = "../rpc" } ethcore-devtools = { path = "../../devtools" } semver = "0.5" -nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" } +nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch="parity-1.5" } ethcore-ipc-nano = { path = "../nano" } ethcore-util = { path = "../../util" } log = "0.3"