Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fix compilation on recent nightlies #10991

Merged
merged 1 commit into from
Aug 27, 2019
Merged

Fix compilation on recent nightlies #10991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ipfs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ common-types = { path = "../ethcore/types" }
ethcore = { path = "../ethcore" }
bytes = { package = "parity-bytes", version = "0.1"}
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"}
rlp = "0.4.0"
cid = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions ipfs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ use std::thread;
use std::sync::{mpsc, Arc};
use std::net::{SocketAddr, IpAddr};

use core::futures::future::{self, FutureResult};
use core::futures::{self, Future};
use jsonrpc_core::futures::future::{self, FutureResult};
use jsonrpc_core::futures::{self, Future};
use client_traits::BlockChainClient;
use http::hyper::{self, server, Method, StatusCode, Body,
header::{self, HeaderValue},
Expand Down