From d9acbbb0279f9934363525312975d45042de6c61 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Fri, 6 May 2016 16:40:24 +0400 Subject: [PATCH] finalizing deps rearrange --- Cargo.lock | 72 ++++++--------------------------------------- Cargo.toml | 2 +- ipc/nano/Cargo.toml | 2 +- rpc/Cargo.toml | 4 +-- webapp/Cargo.toml | 2 +- 5 files changed, 14 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 485b849d8..58809ed45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,7 +19,7 @@ dependencies = [ "ethsync 1.2.0", "fdlimit 0.1.0", "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "json-ipc-server 0.1.0 (git+https://github.com/NikVolf/json-ipc-server.git)", + "json-ipc-server 0.1.0 (git+https://github.com/ethcore/json-ipc-server.git)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -284,7 +284,7 @@ name = "ethcore-ipc-nano" version = "1.2.0" dependencies = [ "ethcore-ipc 1.2.0", - "jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)", + "jsonrpc-core 2.0.4 (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.0 (git+https://github.com/ethcore/nanomsg.rs.git)", ] @@ -300,14 +300,14 @@ dependencies = [ "ethminer 1.2.0", "ethsync 1.2.0", "json-ipc-server 0.1.0 (git+https://github.com/ethcore/json-ipc-server.git)", - "jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)", + "jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "transient-hashmap 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -355,7 +355,7 @@ dependencies = [ "ethcore-rpc 1.2.0", "ethcore-util 1.2.0", "hyper 0.9.2 (git+https://github.com/hyperium/hyper?branch=mio)", - "jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)", + "jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-status 0.3.6 (git+https://github.com/ethcore/parity-status.git)", @@ -539,21 +539,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "json-ipc-server" version = "0.1.0" -source = "git+https://github.com/NikVolf/json-ipc-server.git#6cd82ca91d3938ba1cbb404adc7dd1478605e493" +source = "git+https://github.com/ethcore/json-ipc-server.git#fdcba83d00b127c7419fe21406a5b81998f686eb" dependencies = [ "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 2.0.3 (git+https://github.com/tomusdrw/jsonrpc-core.git)", - "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "json-ipc-server" -version = "0.1.0" -source = "git+https://github.com/ethcore/json-ipc-server.git#c44572fa19c1077e59298df3c3c6533c7cdae11e" -dependencies = [ - "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)", + "jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -568,30 +557,8 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "jsonrpc-core" -version = "2.0.3" -source = "git+https://github.com/ethcore/jsonrpc-core.git#195358904e256e7f130fd151edba42b1bc214354" -dependencies = [ - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "jsonrpc-core" -version = "2.0.3" -source = "git+https://github.com/tomusdrw/jsonrpc-core.git#ede5fe06d9a96ad245b082c00bc49088d038e5f3" dependencies = [ "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -605,7 +572,7 @@ version = "5.1.0" source = "git+https://github.com/ethcore/jsonrpc-http-server.git#b32815330c191aff06a6e017ba00c10e872bb4f6" dependencies = [ "hyper 0.9.2 (git+https://github.com/hyperium/hyper?branch=mio)", - "jsonrpc-core 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1104,14 +1071,6 @@ name = "strsim" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "syntex" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syntex_syntax 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "syntex" version = "0.32.0" @@ -1120,19 +1079,6 @@ dependencies = [ "syntex_syntax 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "syntex_syntax" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "syntex_syntax" version = "0.32.0" diff --git a/Cargo.toml b/Cargo.toml index fc5798fa1..af97737e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ ethcore-webapp = { path = "webapp", optional = true } semver = "0.2" ethcore-ipc-nano = { path = "ipc/nano" } "ethcore-ipc" = { path = "ipc/rpc" } -json-ipc-server = { git = "https://github.com/NikVolf/json-ipc-server.git" } +json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" } [dependencies.hyper] version = "0.8" diff --git a/ipc/nano/Cargo.toml b/ipc/nano/Cargo.toml index 4fd8e4e34..fb68adeb7 100644 --- a/ipc/nano/Cargo.toml +++ b/ipc/nano/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" [features] [dependencies] -jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" } +jsonrpc-core = "2.0" "ethcore-ipc" = { path = "../rpc" } nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" } log = "0.3" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index cb2f970fa..326634ab2 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -12,7 +12,7 @@ build = "build.rs" log = "0.3" serde = "0.7.0" serde_json = "0.7.0" -jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" } +jsonrpc-core = "2.0" jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" } ethcore-util = { path = "../util" } ethcore = { path = "../ethcore" } @@ -27,7 +27,7 @@ json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" } [build-dependencies] serde_codegen = { version = "0.7.0", optional = true } -syntex = "^0.31.0" +syntex = "^0.32.0" [features] default = ["serde_codegen"] diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml index 4bfe5400f..ccc0d189d 100644 --- a/webapp/Cargo.toml +++ b/webapp/Cargo.toml @@ -9,7 +9,7 @@ authors = ["Ethcore