Skip to content

Commit

Permalink
Resolve possible trait import conflict. (#581)
Browse files Browse the repository at this point in the history
* Resolve possible trait import conflict.

* Bump derive version.
  • Loading branch information
tomusdrw authored Sep 3, 2020
1 parent e91d7f3 commit db92ed1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ homepage = "https://github.com/paritytech/jsonrpc"
license = "MIT"
name = "jsonrpc-derive"
repository = "https://github.com/paritytech/jsonrpc"
version = "14.2.1"
version = "14.2.2"

[lib]
proc-macro = true
Expand Down
2 changes: 1 addition & 1 deletion derive/src/to_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub fn generate_client_module(
Call, Error, ErrorCode, Id, MethodCall, Params, Request,
Response, Version,
};
use _jsonrpc_core::futures::prelude::*;
use _jsonrpc_core::futures::prelude::Future;
use _jsonrpc_core::futures::sync::{mpsc, oneshot};
use _jsonrpc_core::serde_json::{self, Value};
use _jsonrpc_core_client::{RpcChannel, RpcError, RpcFuture, TypedClient, TypedSubscriptionStream};
Expand Down

0 comments on commit db92ed1

Please sign in to comment.