Fix other clippy warning (paritytech#395)

* fix missing docs attribute

* use shorthand syntax

* fix some other clippy warnings

Author: Andronik Ordian

core/src/delegates.rs

@@ -79,7 +79,7 @@ impl<T, M> IoDelegate<T, M> where
 	/// Creates new `IoDelegate`
 	pub fn new(delegate: Arc<T>) -> Self {
 		IoDelegate {
-			delegate: delegate,
+			delegate,
 			methods: HashMap::new(),
 		}
 	}

core/src/io.rs

@@ -64,17 +64,17 @@ impl Default for Compatibility {
 }
 
 impl Compatibility {
-	fn is_version_valid(&self, version: Option<Version>) -> bool {
-		match (*self, version) {
+	fn is_version_valid(self, version: Option<Version>) -> bool {
+		match (self, version) {
 			(Compatibility::V1, None) |
 			(Compatibility::V2, Some(Version::V2)) |
 			(Compatibility::Both, _) => true,
 			_ => false,
 		}
 	}
 
-	fn default_version(&self) -> Option<Version> {
-		match *self {
+	fn default_version(self) -> Option<Version> {
+		match self {
 			Compatibility::V1 => None,
 			Compatibility::V2 | Compatibility::Both => Some(Version::V2),
 		}
@@ -101,7 +101,7 @@ impl<T: Metadata> MetaIoHandler<T> {
 	/// Creates new `MetaIoHandler` compatible with specified protocol version.
 	pub fn with_compatibility(compatibility: Compatibility) -> Self {
 		MetaIoHandler {
-			compatibility: compatibility,
+			compatibility,
 			middleware: Default::default(),
 			methods: Default::default(),
 		}
@@ -113,8 +113,8 @@ impl<T: Metadata, S: Middleware<T>> MetaIoHandler<T, S> {
 	/// Creates new `MetaIoHandler`
 	pub fn new(compatibility: Compatibility, middleware: S) -> Self {
 		MetaIoHandler {
-			compatibility: compatibility,
-			middleware: middleware,
+			compatibility,
+			middleware,
 			methods: Default::default(),
 		}
 	}
@@ -123,7 +123,7 @@ impl<T: Metadata, S: Middleware<T>> MetaIoHandler<T, S> {
 	pub fn with_middleware(middleware: S) -> Self {
 		MetaIoHandler {
 			compatibility: Default::default(),
-			middleware: middleware,
+			middleware,
 			methods: Default::default(),
 		}
 	}

core/src/types/error.rs

@@ -94,7 +94,7 @@ impl Error {
 	pub fn new(code: ErrorCode) -> Self {
 		Error {
 			message: code.description(),
-			code: code,
+			code,
 			data: None
 		}
 	}

core/src/types/response.rs

@@ -41,23 +41,23 @@ impl Output {
 	pub fn from(result: CoreResult<Value>, id: Id, jsonrpc: Option<Version>) -> Self {
 		match result {
 			Ok(result) => Output::Success(Success {
-				id: id,
-				jsonrpc: jsonrpc,
-				result: result,
+				id,
+				jsonrpc,
+				result,
 			}),
 			Err(error) => Output::Failure(Failure {
-				id: id,
-				jsonrpc: jsonrpc,
-				error: error,
+				id,
+				jsonrpc,
+				error,
 			}),
 		}
 	}
 
 	/// Creates new failure output indicating malformed request.
 	pub fn invalid_request(id: Id, jsonrpc: Option<Version>) -> Self {
 		Output::Failure(Failure {
-			id: id,
-			jsonrpc: jsonrpc,
+			id,
+			jsonrpc,
 			error: Error::new(ErrorCode::InvalidRequest),
 		})
 	}
@@ -104,8 +104,8 @@ impl Response {
 	pub fn from(error: Error, jsonrpc: Option<Version>) -> Self {
 		Failure {
 			id: Id::Null,
-			jsonrpc: jsonrpc,
-			error: error,
+			jsonrpc,
+			error,
 		}.into()
 	}
 }

core/src/types/version.rs

@@ -14,8 +14,8 @@ pub enum Version {
 impl Serialize for Version {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
 	where S: Serializer {
-		match self {
-			&Version::V2 => serializer.serialize_str("2.0")
+		match *self {
+			Version::V2 => serializer.serialize_str("2.0")
 		}
 	}
 }

derive/src/rpc_attr.rs

@@ -73,7 +73,7 @@ impl RpcMethodAttribute {
 									.map_or(Vec::new(), |ml| get_aliases(ml));
 								Ok(RpcMethodAttribute {
 									attr: attr.clone(),
-									name: name,
+									name,
 									aliases,
 									kind
 								})

derive/src/to_delegate.rs

@@ -273,7 +273,7 @@ impl RpcMethod {
 		let total_args_num = param_types.len();
 		let required_args_num = total_args_num - trailing_args_num;
 
-		let switch_branches = (0..trailing_args_num+1)
+		let switch_branches = (0..=trailing_args_num)
 			.map(|passed_trailing_args_num| {
 				let passed_args_num = required_args_num + passed_trailing_args_num;
 				let passed_param_types = &param_types[..passed_args_num];

http/src/handler.rs

@@ -260,7 +260,7 @@ impl<M: Metadata, S: Middleware<M>> Future for RpcHandler<M, S> {
 			},
 			RpcHandlerState::WaitingForResponse(mut waiting) => {
 				match waiting.poll() {
-					Ok(Async::Ready(response)) => RpcPollState::Ready(RpcHandlerState::Writing(response.into())),
+					Ok(Async::Ready(response)) => RpcPollState::Ready(RpcHandlerState::Writing(response)),
 					Ok(Async::NotReady) => RpcPollState::NotReady(RpcHandlerState::WaitingForResponse(waiting)),
 					Err(e) => RpcPollState::Ready(RpcHandlerState::Writing(
 						Response::internal_error(format!("{:?}", e))
@@ -275,7 +275,7 @@ impl<M: Metadata, S: Middleware<M>> Future for RpcHandler<M, S> {
 							None => Response::ok(String::new()),
 							// Add new line to have nice output when using CLI clients (curl)
 							Some(result) => Response::ok(format!("{}\n", result)),
-						}.into()))
+						}))
 					},
 					Ok(Async::NotReady) => RpcPollState::NotReady(RpcHandlerState::Waiting(waiting)),
 					Err(e) => RpcPollState::Ready(RpcHandlerState::Writing(
@@ -404,7 +404,7 @@ impl<M: Metadata, S: Middleware<M>> RpcHandler<M, S> {
 			id: Id::Num(1),
 		}));
 
-		return Ok(RpcPollState::Ready(RpcHandlerState::WaitingForResponse(
+		Ok(RpcPollState::Ready(RpcHandlerState::WaitingForResponse(
 			future::Either::B(self.jsonrpc_handler.handler.handle_rpc_request(call, metadata))
 				.map(|res| match res {
 					Some(core::Response::Single(Output::Success(Success { result, .. }))) => {
@@ -421,7 +421,7 @@ impl<M: Metadata, S: Middleware<M>> RpcHandler<M, S> {
 					},
 					e => Response::internal_error(format!("Invalid response for health request: {:?}", e)),
 				})
-		)));
+		)))
 	}
 
 	fn process_rest(
@@ -452,12 +452,12 @@ impl<M: Metadata, S: Middleware<M>> RpcHandler<M, S> {
 			id: Id::Num(1),
 		}));
 
-		return Ok(RpcPollState::Ready(RpcHandlerState::Waiting(
+		Ok(RpcPollState::Ready(RpcHandlerState::Waiting(
 			future::Either::B(self.jsonrpc_handler.handler.handle_rpc_request(call, metadata))
 				.map(|res| res.map(|x| serde_json::to_string(&x)
 					.expect("Serialization of response is infallible;qed")
 				))
-		)));
+		)))
 	}
 
 	fn process_body(

http/src/lib.rs

@@ -321,7 +321,7 @@ impl<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>> ServerBuilder<M, S> {
 
 	/// Configure the CORS `AccessControlAllowHeaders` header which are allowed.
 	pub fn cors_allow_headers(mut self, allowed_headers: cors::AccessControlAllowHeaders) -> Self {
-		self.allowed_headers = allowed_headers.into();
+		self.allowed_headers = allowed_headers;
 		self
 	}
 
@@ -583,8 +583,8 @@ impl Server {
 
 impl Drop for Server {
 	fn drop(&mut self) {
-		self.executor.take().map(|executors| {
+		if let Some(executors) = self.executor.take() {
 			for executor in executors { executor.close(); }
-		});
+		};
 	}
 }

http/src/response.rs

@@ -42,7 +42,7 @@ impl Response {
 		Response {
 			code: StatusCode::SERVICE_UNAVAILABLE,
 			content_type: HeaderValue::from_static("application/json; charset=utf-8"),
-			content: format!("{}", msg.into()),
+			content: msg.into(),
 		}
 	}