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
paritytech · Jan 29, 2019 · 37b62a3 · 37b62a3
1 parent 5a7be5f
commit 37b62a3
Show file tree

Hide file tree

Showing 73 changed files with 246 additions and 308 deletions.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -8,6 +8,7 @@ version = "10.0.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"]
 documentation = "https://paritytech.github.io/jsonrpc/jsonrpc_core/index.html"
+edition = "2018"
 
 categories = [
 	"asynchronous",

diff --git a/core/README.md b/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;
 

diff --git a/core/examples/async.rs b/core/examples/async.rs
@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 use jsonrpc_core::futures::Future;
 

diff --git a/core/examples/basic.rs b/core/examples/basic.rs
@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 
 fn main() {

diff --git a/core/examples/meta.rs b/core/examples/meta.rs
@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use jsonrpc_core::*;
 use jsonrpc_core::futures::Future;
 

diff --git a/core/examples/middlewares.rs b/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::*;

diff --git a/core/src/calls.rs b/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 {}

diff --git a/core/src/delegates.rs b/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>,

diff --git a/core/src/io.rs b/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]

diff --git a/core/src/lib.rs b/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::*;
diff --git a/core/src/middleware.rs b/core/src/middleware.rs
@@ -1,7 +1,7 @@
 //! `IoHandler` middlewares
 
-use calls::Metadata;
-use types::{Request, Response, Call, Output};
+use crate::calls::Metadata;
+use crate::types::{Request, Response, Call, Output};
 use futures::{future::Either, Future};
 
 /// RPC middleware

diff --git a/core/src/types/error.rs b/core/src/types/error.rs
@@ -65,7 +65,7 @@ impl From<i64> for ErrorCode {
 impl<'a> Deserialize<'a> for ErrorCode {
 	fn deserialize<D>(deserializer: D) -> Result<ErrorCode, D::Error>
 	where D: Deserializer<'a> {
-		let code: i64 = try!(Deserialize::deserialize(deserializer));
+		let code: i64 = Deserialize::deserialize(deserializer)?;
 		Ok(ErrorCode::from(code))
 	}
 }

diff --git a/core/src/types/params.rs b/core/src/types/params.rs
@@ -46,7 +46,7 @@ impl Params {
 mod tests {
 	use serde_json;
 	use super::Params;
-	use types::{Value, Error, ErrorCode};
+	use crate::types::{Value, Error, ErrorCode};
 
 	#[test]
 	fn params_deserialization() {

diff --git a/core/src/types/response.rs b/core/src/types/response.rs
@@ -1,6 +1,6 @@
 //! jsonrpc response
 use super::{Id, Value, Error, ErrorCode, Version};
-use {Result as CoreResult};
+use crate::{Result as CoreResult};
 
 /// Successful response
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]

diff --git a/derive/examples/generic-trait.rs b/derive/examples/generic-trait.rs
@@ -1,4 +1,4 @@
-extern crate jsonrpc_core;
+use jsonrpc_core;
 
 use jsonrpc_core::{IoHandler, Error, Result};
 use jsonrpc_core::futures::future::{self, FutureResult};

diff --git a/derive/tests/compiletests.rs b/derive/tests/compiletests.rs
@@ -1,4 +1,4 @@
-extern crate compiletest_rs as compiletest;
+use compiletest_rs as compiletest;
 
 use std::path::PathBuf;
 

diff --git a/derive/tests/pubsub-macros.rs b/derive/tests/pubsub-macros.rs
@@ -1,6 +1,6 @@
-extern crate serde_json;
-extern crate jsonrpc_core;
-extern crate jsonrpc_pubsub;
+use serde_json;
+use jsonrpc_core;
+use jsonrpc_pubsub;
 #[macro_use]
 extern crate jsonrpc_derive;
 

diff --git a/http/Cargo.toml b/http/Cargo.toml
@@ -8,6 +8,7 @@ version = "10.0.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 keywords = ["jsonrpc", "json-rpc", "json", "rpc", "server"]
 documentation = "https://paritytech.github.io/jsonrpc/jsonrpc_http_server/index.html"
+edition = "2018"
 
 [dependencies]
 hyper = "0.12"

diff --git a/http/README.md b/http/README.md
@@ -15,8 +15,6 @@ jsonrpc-http-server = "10.0"
 `main.rs`
 
 ```rust
-extern crate jsonrpc_http_server;
-
 use jsonrpc_http_server::*;
 use jsonrpc_http_server::jsonrpc_core::*;
 

diff --git a/http/examples/http_async.rs b/http/examples/http_async.rs
@@ -1,5 +1,3 @@
-extern crate jsonrpc_http_server;
-
 use jsonrpc_http_server::{ServerBuilder, DomainsValidation, AccessControlAllowOrigin};
 use jsonrpc_http_server::jsonrpc_core::*;
 

diff --git a/http/examples/http_meta.rs b/http/examples/http_meta.rs
@@ -1,6 +1,3 @@
-extern crate jsonrpc_http_server;
-extern crate unicase;
-
 use jsonrpc_http_server::{ServerBuilder, hyper, RestApi, cors::AccessControlAllowHeaders};
 use jsonrpc_http_server::jsonrpc_core::*;
 

diff --git a/http/examples/http_middleware.rs b/http/examples/http_middleware.rs
@@ -1,5 +1,3 @@
-extern crate jsonrpc_http_server;
-
 use jsonrpc_http_server::{
 	hyper, ServerBuilder, DomainsValidation, AccessControlAllowOrigin, Response, RestApi
 };

diff --git a/http/examples/server.rs b/http/examples/server.rs
@@ -1,5 +1,3 @@
-extern crate jsonrpc_http_server;
-
 use jsonrpc_http_server::{ServerBuilder, DomainsValidation, AccessControlAllowOrigin, RestApi};
 use jsonrpc_http_server::jsonrpc_core::*;
 

diff --git a/http/src/handler.rs b/http/src/handler.rs
@@ -1,18 +1,18 @@
-use Rpc;
+use crate::Rpc;
 
 use std::{fmt, mem, str};
 use std::sync::Arc;
 
 use hyper::{self, service::Service, Body, Method};
 use hyper::header::{self, HeaderMap, HeaderValue};
 
-use jsonrpc::{self as core, middleware, FutureResult, Metadata, Middleware};
-use jsonrpc::futures::{Future, Poll, Async, Stream, future};
-use jsonrpc::serde_json;
-use response::Response;
-use server_utils::cors;
+use crate::jsonrpc::{self as core, middleware, FutureResult, Metadata, Middleware};
+use crate::jsonrpc::futures::{Future, Poll, Async, Stream, future};
+use crate::jsonrpc::serde_json;
+use crate::response::Response;
+use crate::server_utils::cors;
 
-use {utils, RequestMiddleware, RequestMiddlewareAction, CorsDomains, AllowedHosts, RestApi};
+use crate::{utils, RequestMiddleware, RequestMiddlewareAction, CorsDomains, AllowedHosts, RestApi};
 
 /// jsonrpc http request handler.
 pub struct ServerHandler<M: Metadata = (), S: Middleware<M> = middleware::Noop> {

diff --git a/http/src/lib.rs b/http/src/lib.rs
@@ -1,9 +1,6 @@
 //! jsonrpc http server.
 //!
 //! ```no_run
-//! extern crate jsonrpc_core;
-//! extern crate jsonrpc_http_server;
-//!
 //! use jsonrpc_core::*;
 //! use jsonrpc_http_server::*;
 //!
@@ -23,12 +20,12 @@
 
 #![warn(missing_docs)]
 
-extern crate unicase;
-extern crate jsonrpc_server_utils as server_utils;
-extern crate net2;
 
-pub extern crate jsonrpc_core;
-pub extern crate hyper;
+use jsonrpc_server_utils as server_utils;
+use net2;
+
+pub use jsonrpc_core;
+pub use hyper;
 
 #[macro_use]
 extern crate log;
@@ -46,17 +43,17 @@ use std::thread;
 
 use hyper::{server, Body};
 use jsonrpc_core as jsonrpc;
-use jsonrpc::MetaIoHandler;
-use jsonrpc::futures::{self, Future, Stream, future};
-use jsonrpc::futures::sync::oneshot;
-use server_utils::reactor::{Executor, UninitializedExecutor};
-
-pub use server_utils::hosts::{Host, DomainsValidation};
-pub use server_utils::cors::{self, AccessControlAllowOrigin, Origin, AllowCors};
-pub use server_utils::{tokio, SuspendableStream};
-pub use handler::ServerHandler;
-pub use utils::{is_host_allowed, cors_allow_origin, cors_allow_headers};
-pub use response::Response;
+use crate::jsonrpc::MetaIoHandler;
+use crate::jsonrpc::futures::{self, Future, Stream, future};
+use crate::jsonrpc::futures::sync::oneshot;
+use crate::server_utils::reactor::{Executor, UninitializedExecutor};
+
+pub use crate::server_utils::hosts::{Host, DomainsValidation};
+pub use crate::server_utils::cors::{self, AccessControlAllowOrigin, Origin, AllowCors};
+pub use crate::server_utils::{tokio, SuspendableStream};
+pub use crate::handler::ServerHandler;
+pub use crate::utils::{is_host_allowed, cors_allow_origin, cors_allow_headers};
+pub use crate::response::Response;
 
 /// Action undertaken by a middleware.
 pub enum RequestMiddlewareAction {
@@ -540,7 +537,7 @@ fn configure_port(reuse: bool, tcp: &net2::TcpBuilder) -> io::Result<()> {
 	use net2::unix::*;
 
 	if reuse {
-		try!(tcp.reuse_port(true));
+		tcp.reuse_port(true)?;
 	}
 
 	Ok(())

diff --git a/http/src/tests.rs b/http/src/tests.rs
@@ -1,4 +1,4 @@
-extern crate jsonrpc_core;
+use jsonrpc_core;
 
 use std::str::Lines;
 use std::net::TcpStream;

diff --git a/http/src/utils.rs b/http/src/utils.rs
@@ -1,6 +1,6 @@
 use hyper::{self, header};
 
-use server_utils::{cors, hosts};
+use crate::server_utils::{cors, hosts};
 
 /// Extracts string value of a single header in request.
 fn read_header<'a>(req: &'a hyper::Request<hyper::Body>, header_name: &str) -> Option<&'a str> {

diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
@@ -7,6 +7,7 @@ license = "MIT"
 homepage = "https://github.com/paritytech/jsonrpc"
 repository = "https://github.com/paritytech/jsonrpc"
 documentation = "https://paritytech.github.io/jsonrpc/json_ipc_server/index.html"
+edition = "2018"
 
 [dependencies]
 log = "0.4"

diff --git a/ipc/README.md b/ipc/README.md
@@ -15,8 +15,6 @@ jsonrpc-ipc-server = "10.0"
 `main.rs`
 
 ```rust
-extern crate jsonrpc_ipc_server;
-
 use jsonrpc_ipc_server::Server;
 use jsonrpc_ipc_server::jsonrpc_core::*;
 

diff --git a/ipc/examples/ipc.rs b/ipc/examples/ipc.rs
@@ -1,4 +1,4 @@
-extern crate jsonrpc_ipc_server;
+use jsonrpc_ipc_server;
 
 use jsonrpc_ipc_server::jsonrpc_core::*;
 

diff --git a/ipc/src/lib.rs b/ipc/src/lib.rs
@@ -2,17 +2,14 @@
 
 #![warn(missing_docs)]
 
-extern crate jsonrpc_server_utils as server_utils;
-extern crate parity_tokio_ipc;
-extern crate tokio_service;
-extern crate parking_lot;
+use jsonrpc_server_utils as server_utils;
 
-pub extern crate jsonrpc_core;
+pub use jsonrpc_core;
 
 #[macro_use] extern crate log;
 
 #[cfg(test)] #[macro_use] extern crate lazy_static;
-#[cfg(test)] extern crate env_logger;
+
 #[cfg(test)] mod logger;
 
 mod server;
@@ -21,8 +18,8 @@ mod meta;
 
 use jsonrpc_core as jsonrpc;
 
-pub use meta::{MetaExtractor, NoopExtractor, RequestContext};
-pub use server::{Server, ServerBuilder, CloseHandle,SecurityAttributes};
+pub use crate::meta::{MetaExtractor, NoopExtractor, RequestContext};
+pub use crate::server::{Server, ServerBuilder, CloseHandle,SecurityAttributes};
 
 pub use self::server_utils::{tokio, codecs::Separator};
 pub use self::server_utils::session::{SessionStats, SessionId};