Migrate to edition 2018 (#368)

* core: cargo fix --edition

* core: edition = 2018

* http: cargo fix --edition

* http: edition = 2018

* ipc: edition 2018

* pubsub: edition 2018

* pubsub: cargo fix --edition-idioms --broken-code, then fixed compile errors

* server-utils: cargo fix --edition

* server-utils: edition 2018

* server-utils: cargo fix --edition-idioms --broken-code

* stdio: edition 2018

* stdio: edition 2018 idioms

* tcp: edition 2018

* tcp: edition 2018 idioms

* test: edition 2018

* test: edition 2018 idioms

* ws: edition 2018

* ws: edition 2018 idioms

* edition 2018: remove whitespaces from cargo fix

* core: edition 2018 idioms

* http: edition 2018 idioms

* derive: edition 2018 idioms

* ipc: edition 2018 idioms

* pubsub: edition 2018 idioms

* Remove more blank lines and unused

* Remove all `dyn` keywords for trait objects

* Remove anonymous lifetimes

* Replace `r#try` with `?`

* Remove `extern crate` in doctests

* Remove `extern crate` in READMEs

* Convert doctest to use derive instead of macros

Author: ascjones

core/Cargo.toml

@@ -8,6 +8,7 @@ version = "10.0.0"
 authors = ["debris <[email protected]>"]
 keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"]
 documentation = "https://paritytech.github.io/jsonrpc/jsonrpc_core/index.html"
+edition = "2018"
 
 categories = [
 	"asynchronous",

core/README.md

@@ -19,8 +19,6 @@ jsonrpc-core = "4.0"
 `main.rs`
 
 ```rust
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 
 fn main() {
@@ -41,8 +39,6 @@ fn main() {
 `main.rs`
 
 ```rust
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 use jsonrpc_core::futures::Future;
 

core/examples/async.rs

@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 use jsonrpc_core::futures::Future;
 

core/examples/basic.rs

@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 
 fn main() {

core/examples/meta.rs

@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 use jsonrpc_core::futures::Future;
 

core/examples/middlewares.rs

@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use std::time::Instant;
 use std::sync::atomic::{self, AtomicUsize};
 use jsonrpc_core::*;

core/src/calls.rs

@@ -1,8 +1,8 @@
 use std::fmt;
 use std::sync::Arc;
-use types::{Params, Value, Error};
+use crate::types::{Params, Value, Error};
 use futures::{Future, IntoFuture};
-use BoxFuture;
+use crate::BoxFuture;
 
 /// Metadata trait
 pub trait Metadata: Clone + Send + 'static {}

core/src/delegates.rs

@@ -3,10 +3,10 @@
 use std::sync::Arc;
 use std::collections::HashMap;
 
-use types::{Params, Value, Error};
-use calls::{Metadata, RemoteProcedure, RpcMethod, RpcNotification};
+use crate::types::{Params, Value, Error};
+use crate::calls::{Metadata, RemoteProcedure, RpcMethod, RpcNotification};
 use futures::IntoFuture;
-use BoxFuture;
+use crate::BoxFuture;
 
 struct DelegateAsyncMethod<T, F> {
 	delegate: Arc<T>,

core/src/io.rs

@@ -5,10 +5,10 @@ use std::ops::{Deref, DerefMut};
 use serde_json;
 use futures::{self, future, Future};
 
-use calls::{RemoteProcedure, Metadata, RpcMethodSimple, RpcMethod, RpcNotificationSimple, RpcNotification};
-use middleware::{self, Middleware};
-use types::{Error, ErrorCode, Version};
-use types::{Request, Response, Call, Output};
+use crate::calls::{RemoteProcedure, Metadata, RpcMethodSimple, RpcMethod, RpcNotificationSimple, RpcNotification};
+use crate::middleware::{self, Middleware};
+use crate::types::{Error, ErrorCode, Version};
+use crate::types::{Request, Response, Call, Output};
 
 /// A type representing middleware or RPC response before serialization.
 pub type FutureResponse = Box<Future<Item=Option<Response>, Error=()> + Send>;
@@ -372,7 +372,7 @@ fn write_response(response: Response) -> String {
 #[cfg(test)]
 mod tests {
 	use futures;
-	use types::{Value};
+	use crate::types::{Value};
 	use super::{IoHandler, Compatibility};
 
 	#[test]

core/src/lib.rs

@@ -3,8 +3,6 @@
 //! Right now it supports only server side handling requests.
 //!
 //! ```rust
-//! extern crate jsonrpc_core;
-//!
 //! use jsonrpc_core::*;
 //! use jsonrpc_core::futures::Future;
 //!
@@ -25,9 +23,8 @@
 
 #[macro_use] extern crate log;
 #[macro_use] extern crate serde_derive;
-extern crate serde;
 
-pub extern crate futures;
+pub use futures;
 
 #[doc(hidden)]
 pub extern crate serde_json;
@@ -45,8 +42,8 @@ pub type BoxFuture<T> = Box<futures::Future<Item = T, Error = Error> + Send>;
 /// A Result type.
 pub type Result<T> = ::std::result::Result<T, Error>;
 
-pub use calls::{RemoteProcedure, Metadata, RpcMethodSimple, RpcMethod, RpcNotificationSimple, RpcNotification};
-pub use delegates::IoDelegate;
-pub use io::{Compatibility, IoHandler, MetaIoHandler, FutureOutput, FutureResult, FutureResponse, FutureRpcResult};
-pub use middleware::{Middleware, Noop as NoopMiddleware};
-pub use types::*;
+pub use crate::calls::{RemoteProcedure, Metadata, RpcMethodSimple, RpcMethod, RpcNotificationSimple, RpcNotification};
+pub use crate::delegates::IoDelegate;
+pub use crate::io::{Compatibility, IoHandler, MetaIoHandler, FutureOutput, FutureResult, FutureResponse, FutureRpcResult};
+pub use crate::middleware::{Middleware, Noop as NoopMiddleware};
+pub use crate::types::*;