grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation on recent nightlies (#10991)

Browse Source 
For reasons unknown (to me) recent rustc nightlies can't find the `format!`-macro in `core` when there is an import named `core`. This PR removes the package rename and uses the full `jsonrpc_core` crate name instead.
This commit is contained in:
David 2019-08-27 09:45:13 +02:00 committed by Andronik Ordian
parent b1e3acaf0c
commit 505e284932
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipfs/Cargo.toml
View File

@ -12,7 +12,7 @@ common-types = { path = "../ethcore/types" }
ethcore = { path = "../ethcore" } ethcore = { path = "../ethcore" }
bytes = { package = "parity-bytes", version = "0.1"} bytes = { package = "parity-bytes", version = "0.1"}
ethereum-types = "0.6.0" ethereum-types = "0.6.0"
core = { package = "jsonrpc-core", version = "12.0.0"} jsonrpc-core = "12.0.0"
http = { package = "jsonrpc-http-server", version = "12.0.0"} http = { package = "jsonrpc-http-server", version = "12.0.0"}
rlp = "0.4.0" rlp = "0.4.0"
cid = "0.3" cid = "0.3"

4
ipfs/src/lib.rs
View File

@ -21,8 +21,8 @@ use std::thread;
use std::sync::{mpsc, Arc}; use std::sync::{mpsc, Arc};
use std::net::{SocketAddr, IpAddr}; use std::net::{SocketAddr, IpAddr};
use core::futures::future::{self, FutureResult}; use jsonrpc_core::futures::future::{self, FutureResult};
use core::futures::{self, Future}; use jsonrpc_core::futures::{self, Future};
use client_traits::BlockChainClient; use client_traits::BlockChainClient;
use http::hyper::{self, server, Method, StatusCode, Body, use http::hyper::{self, server, Method, StatusCode, Body,
header::{self, HeaderValue}, header::{self, HeaderValue},