diff --git a/Cargo.lock b/Cargo.lock index 0faab2258..be8cab787 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,9 +2,8 @@ name = "parity" version = "1.2.0" dependencies = [ - "bincode 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.64 (registry+https://github.com/rust-lang/crates.io-index)", - "ctrlc 1.1.1 (git+https://github.com/tomusdrw/rust-ctrlc.git)", + "ctrlc 1.1.1 (git+https://github.com/ethcore/rust-ctrlc.git)", "daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -20,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)", @@ -28,8 +27,7 @@ dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 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)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -52,10 +50,10 @@ dependencies = [ [[package]] name = "aster" -version = "0.15.0" +version = "0.16.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)", + "syntex_syntax 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -70,17 +68,6 @@ dependencies = [ "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bincode" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (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)", -] - [[package]] name = "bitflags" version = "0.3.3" @@ -111,11 +98,6 @@ name = "bloomchain" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "byteorder" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bytes" version = "0.3.0" @@ -178,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ctrlc" version = "1.1.1" -source = "git+https://github.com/tomusdrw/rust-ctrlc.git#f4927770f89eca80ec250911eea3adcbf579ac48" +source = "git+https://github.com/ethcore/rust-ctrlc.git#f4927770f89eca80ec250911eea3adcbf579ac48" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -290,11 +272,11 @@ dependencies = [ name = "ethcore-ipc-codegen" version = "1.2.0" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -302,7 +284,7 @@ name = "ethcore-ipc-nano" version = "1.2.0" dependencies = [ "ethcore-ipc 1.2.0", - "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)", "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)", ] @@ -317,15 +299,15 @@ dependencies = [ "ethcore-util 1.2.0", "ethminer 1.2.0", "ethsync 1.2.0", - "json-ipc-server 0.1.0 (git+https://github.com/NikVolf/json-ipc-server.git)", - "jsonrpc-core 2.0.3 (git+https://github.com/tomusdrw/jsonrpc-core.git)", - "jsonrpc-http-server 5.1.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git)", + "json-ipc-server 0.1.0 (git+https://github.com/ethcore/json-ipc-server.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.2 (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)", ] @@ -372,9 +354,9 @@ dependencies = [ "clippy 0.0.64 (registry+https://github.com/rust-lang/crates.io-index)", "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/tomusdrw/jsonrpc-core.git)", - "jsonrpc-http-server 5.1.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git)", + "hyper 0.9.3 (git+https://github.com/hyperium/hyper?branch=mio)", + "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)", "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)", @@ -388,9 +370,9 @@ dependencies = [ "ethcore-util 1.2.0", "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.2 (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)", ] [[package]] @@ -507,8 +489,8 @@ dependencies = [ [[package]] name = "hyper" -version = "0.9.2" -source = "git+https://github.com/hyperium/hyper?branch=mio#11930b61857e15830d558303ba5e77f6c02d06fd" +version = "0.9.3" +source = "git+https://github.com/hyperium/hyper?branch=mio#dbb4cf160ebf242f7f0459d547c40e9e6877ccf4" dependencies = [ "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -557,10 +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)", + "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)", ] @@ -575,33 +557,22 @@ 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.2 (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#9d51f1b6679938846d93cbafdd052733c816d28b" -dependencies = [ - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen 0.7.2 (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)", ] [[package]] name = "jsonrpc-http-server" version = "5.1.0" -source = "git+https://github.com/tomusdrw/jsonrpc-http-server.git#fafd6410284710b7e662fe7d76249cc496451f27" +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.3 (git+https://github.com/tomusdrw/jsonrpc-core.git)", + "hyper 0.9.3 (git+https://github.com/hyperium/hyper?branch=mio)", + "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)", ] @@ -904,20 +875,20 @@ dependencies = [ [[package]] name = "quasi" -version = "0.9.0" +version = "0.10.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)", + "syntex_syntax 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_codegen" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1050,14 +1021,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1102,15 +1073,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syntex" -version = "0.31.0" +version = "0.32.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)", + "syntex_syntax 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syntex_syntax" -version = "0.31.0" +version = "0.32.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)", diff --git a/Cargo.toml b/Cargo.toml index f6b328b29..af97737e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ env_logger = "0.3" rustc-serialize = "0.3" docopt = "0.6" time = "0.1" -ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" } +ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" } fdlimit = { path = "util/fdlimit" } daemonize = "0.2" num_cpus = "0.2" @@ -34,9 +34,7 @@ ethcore-webapp = { path = "webapp", optional = true } semver = "0.2" ethcore-ipc-nano = { path = "ipc/nano" } "ethcore-ipc" = { path = "ipc/rpc" } -bincode = "*" -serde = "0.7.0" -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/codegen/Cargo.toml b/ipc/codegen/Cargo.toml index 5f8dd089c..78ca6a7b4 100644 --- a/ipc/codegen/Cargo.toml +++ b/ipc/codegen/Cargo.toml @@ -14,13 +14,13 @@ nightly-testing = ["clippy"] with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] [build-dependencies] -quasi_codegen = { version = "*", optional = true } -syntex = { version = "*", optional = true } +quasi_codegen = { version = "0.10", optional = true } +syntex = { version = "^0.31", optional = true } [dependencies] -aster = { version = "^0.15.0", default-features = false } +aster = { version = "0.16", default-features = false } clippy = { version = "^0.*", optional = true } -quasi = { version = "*", default-features = false } -quasi_macros = { version = "*", optional = true } -syntex = { version = "*", optional = true } -syntex_syntax = { version = "*", optional = true } +quasi = { version = "0.10", default-features = false } +quasi_macros = { version = "0.10", optional = true } +syntex = { version = "0.32", optional = true } +syntex_syntax = { version = "0.32", optional = true } diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs index 582aa9332..6f16994b6 100644 --- a/ipc/codegen/src/codegen.rs +++ b/ipc/codegen/src/codegen.rs @@ -197,14 +197,14 @@ fn implement_dispatch_arm_invoke_stmt( let mut tt = ::std::vec::Vec::new(); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc"), ::syntax::parse::token::ModName))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary"), ::syntax::parse::token::ModName))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot)); tt.extend(::quasi::ToTokens::to_tokens(&function_name, ext_cx).into_iter()); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); @@ -217,7 +217,7 @@ fn implement_dispatch_arm_invoke_stmt( tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); @@ -365,18 +365,18 @@ fn implement_client_method_body( { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let"), ::syntax::parse::token::Plain))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let")))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Eq)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); for arg in dispatch.input_arg_names.iter() { - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Colon)); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); } @@ -452,18 +452,18 @@ fn implement_client_method( { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn")))); tt.extend(::quasi::ToTokens::to_tokens(&method_name, ext_cx).into_iter()); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); for arg_idx in 0..dispatch.input_arg_names.len() { let arg_name = dispatch.input_arg_names[arg_idx].as_str(); let arg_ty = dispatch.input_arg_tys[arg_idx].clone(); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name), ::syntax::parse::token::Plain))); + tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name)))); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Colon)); tt.extend(::quasi::ToTokens::to_tokens(&arg_ty, ext_cx).into_iter()); tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); diff --git a/ipc/codegen/src/serialization.rs b/ipc/codegen/src/serialization.rs index 3f535aafc..6a9784790 100644 --- a/ipc/codegen/src/serialization.rs +++ b/ipc/codegen/src/serialization.rs @@ -372,47 +372,47 @@ fn fields_sequence( { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); - tt.push(Token(_sp, token::Ident(variant_ident.clone(), token::Plain))); + tt.push(Token(_sp, token::Ident(variant_ident.clone()))); tt.push(Token(_sp, token::OpenDelim(token::Paren))); for (idx, field) in fields.iter().enumerate() { if field.ident.is_some() { - tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap(), token::Plain))); + tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap()))); tt.push(Token(_sp, token::Colon)); } - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!")))); tt.push(Token(_sp, token::OpenDelim(token::Paren))); - tt.push(Token( - _sp, - token::Ident( - ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))), - token::Plain))); + tt.push( + Token( + _sp, + token::Ident(ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty)))) + )); tt.push(Token(_sp, token::ModSep)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes")))); tt.push(Token(_sp, token::OpenDelim(token::Paren))); tt.push(Token(_sp, token::BinOp(token::And))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::DotDot)); if idx+1 != fields.len() { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1))))); tt.push(Token(_sp, token::CloseDelim(token::Bracket))); } tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::Comma)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack")))); tt.push(Token(_sp, token::CloseDelim(token::Paren))); tt.push(Token(_sp, token::CloseDelim(token::Paren))); @@ -439,53 +439,53 @@ fn named_fields_sequence( { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("let"), token::Plain))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("result"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("let")))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("result")))); tt.push(Token(_sp, token::Eq)); tt.push(Token( _sp, token::Ident( - ext_cx.ident_of(&::syntax::print::pprust::ty_to_string(ty)), - token::Plain))); + ext_cx.ident_of(&::syntax::print::pprust::ty_to_string(ty)) + ))); tt.push(Token(_sp, token::OpenDelim(token::Brace))); for (idx, field) in fields.iter().enumerate() { - tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap(), token::Plain))); + tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap()))); tt.push(Token(_sp, token::Colon)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!")))); tt.push(Token(_sp, token::OpenDelim(token::Paren))); tt.push(Token( _sp, token::Ident( - ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))), - token::Plain))); + ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))) + ))); tt.push(Token(_sp, token::ModSep)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes")))); tt.push(Token(_sp, token::OpenDelim(token::Paren))); tt.push(Token(_sp, token::BinOp(token::And))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::DotDot)); if idx + 1 != fields.len() { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1))))); tt.push(Token(_sp, token::CloseDelim(token::Bracket))); } tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::Comma)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"), token::Plain))); + tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack")))); tt.push(Token(_sp, token::CloseDelim(token::Paren))); diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml index bde5b4c62..c3a0697c9 100644 --- a/ipc/tests/Cargo.toml +++ b/ipc/tests/Cargo.toml @@ -17,5 +17,4 @@ ethcore-util = { path = "../../util" } [build-dependencies] syntex = "*" -serde_codegen = "0.7.0" "ethcore-ipc-codegen" = { path = "../codegen" } diff --git a/ipc/tests/build.rs b/ipc/tests/build.rs index 3600ed7b9..da5d939f2 100644 --- a/ipc/tests/build.rs +++ b/ipc/tests/build.rs @@ -16,7 +16,6 @@ extern crate syntex; extern crate ethcore_ipc_codegen as codegen; -extern crate serde_codegen; use std::env; use std::path::Path; diff --git a/json/Cargo.toml b/json/Cargo.toml index 48014189b..e6b914f4f 100644 --- a/json/Cargo.toml +++ b/json/Cargo.toml @@ -14,7 +14,7 @@ clippy = { version = "0.0.64", optional = true} [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/parity/main.rs b/parity/main.rs index c143f0b05..ded07505c 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -40,8 +40,6 @@ extern crate rpassword; extern crate semver; extern crate ethcore_ipc as ipc; extern crate ethcore_ipc_nano as nanoipc; -extern crate serde; -extern crate bincode; #[macro_use] extern crate hyper; // for price_info.rs extern crate json_ipc_server as jsonipc; diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 1c8117335..326634ab2 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -12,8 +12,8 @@ build = "build.rs" log = "0.3" serde = "0.7.0" serde_json = "0.7.0" -jsonrpc-core = { git = "https://github.com/tomusdrw/jsonrpc-core.git" } -jsonrpc-http-server = { git = "https://github.com/tomusdrw/jsonrpc-http-server.git", version = "5.1.0" } +jsonrpc-core = "2.0" +jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" } ethcore-util = { path = "../util" } ethcore = { path = "../ethcore" } ethash = { path = "../ethash" } @@ -23,11 +23,11 @@ rustc-serialize = "0.3" transient-hashmap = "0.1" serde_macros = { version = "0.7.0", optional = true } clippy = { version = "0.0.64", optional = true} -json-ipc-server = { git = "https://github.com/NikVolf/json-ipc-server.git" } +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/rpc/rpctest/Cargo.toml b/rpc/rpctest/Cargo.toml index f3b8b5053..da10561d5 100644 --- a/rpc/rpctest/Cargo.toml +++ b/rpc/rpctest/Cargo.toml @@ -6,7 +6,7 @@ license = "GPL-3.0" authors = ["Ethcore "] [dependencies] -ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" } +ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" } docopt = "0.6" rustc-serialize = "0.3" ethcore = { path = "../../ethcore" } diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml index 2da9b96f1..ccc0d189d 100644 --- a/webapp/Cargo.toml +++ b/webapp/Cargo.toml @@ -9,8 +9,8 @@ authors = ["Ethcore