From a26f1fb70913d59c2866ace97a24d5517f9769a3 Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Wed, 6 Jul 2022 22:49:10 +0200 Subject: [PATCH] fix clippy (#817) --- core/src/client/async_client/mod.rs | 18 +++++++++--------- core/src/http_helpers.rs | 2 +- core/src/server/rpc_module.rs | 4 ++-- http-server/src/server.rs | 11 +++++------ proc-macros/src/helpers.rs | 4 ++-- ws-server/src/server.rs | 12 ++++++------ 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/core/src/client/async_client/mod.rs b/core/src/client/async_client/mod.rs index 8edb7a4476..43dfb9089f 100644 --- a/core/src/client/async_client/mod.rs +++ b/core/src/client/async_client/mod.rs @@ -450,7 +450,7 @@ async fn handle_backend_messages( max_notifs_per_subscription: usize, ) -> Result<(), Error> { // Single response to a request. - if let Ok(single) = serde_json::from_slice::>(&raw) { + if let Ok(single) = serde_json::from_slice::>(raw) { match process_single_response(manager, single, max_notifs_per_subscription) { Ok(Some(unsub)) => { stop_subscription(sender, manager, unsub).await; @@ -460,34 +460,34 @@ async fn handle_backend_messages( } } // Subscription response. - else if let Ok(response) = serde_json::from_slice::>(&raw) { + else if let Ok(response) = serde_json::from_slice::>(raw) { if let Err(Some(unsub)) = process_subscription_response(manager, response) { - let _ = stop_subscription(sender, manager, unsub).await; + stop_subscription(sender, manager, unsub).await; } } // Subscription error response. - else if let Ok(response) = serde_json::from_slice::>(&raw) { + else if let Ok(response) = serde_json::from_slice::>(raw) { let _ = process_subscription_close_response(manager, response); } // Incoming Notification - else if let Ok(notif) = serde_json::from_slice::>(&raw) { + else if let Ok(notif) = serde_json::from_slice::>(raw) { let _ = process_notification(manager, notif); } // Batch response. - else if let Ok(batch) = serde_json::from_slice::>>(&raw) { + else if let Ok(batch) = serde_json::from_slice::>>(raw) { if let Err(e) = process_batch_response(manager, batch) { return Err(e); } } // Error response - else if let Ok(err) = serde_json::from_slice::(&raw) { + else if let Ok(err) = serde_json::from_slice::(raw) { if let Err(e) = process_error_response(manager, err) { return Err(e); } } // Unparsable response else { - let json = serde_json::from_slice::(&raw); + let json = serde_json::from_slice::(raw); let json_str = match json { Ok(json) => serde_json::to_string(&json).expect("valid JSON; qed"), @@ -519,7 +519,7 @@ async fn handle_backend_messages( } } - return Ok(()); + Ok(()) } /// Handle frontend messages. diff --git a/core/src/http_helpers.rs b/core/src/http_helpers.rs index 19dd8afd23..67d10b3d29 100644 --- a/core/src/http_helpers.rs +++ b/core/src/http_helpers.rs @@ -112,7 +112,7 @@ pub fn get_cors_request_headers<'a>(headers: &'a hyper::header::HeaderMap) -> im read_header_values(headers, ACCESS_CONTROL_REQUEST_HEADERS) .iter() .filter_map(|val| val.to_str().ok()) - .flat_map(|val| val.split(",")) + .flat_map(|val| val.split(',')) // The strings themselves might contain leading and trailing whitespaces .map(|s| s.trim()) } diff --git a/core/src/server/rpc_module.rs b/core/src/server/rpc_module.rs index fb3277e490..371cc61c1d 100644 --- a/core/src/server/rpc_module.rs +++ b/core/src/server/rpc_module.rs @@ -769,7 +769,7 @@ impl RpcModule { let (tx, rx) = oneshot::channel(); let sink = SubscriptionSink { - inner: method_sink.clone(), + inner: method_sink, close_notify: Some(conn.close_notify), method: notif_method_name, subscribers: subscribers.clone(), @@ -780,7 +780,7 @@ impl RpcModule { }; // The callback returns a `SubscriptionResult` for better ergonomics and is not propagated further. - if let Err(_) = callback(params, sink, ctx.clone()) { + if callback(params, sink, ctx.clone()).is_err() { tracing::warn!("subscribe call `{}` failed", subscribe_method_name); } diff --git a/http-server/src/server.rs b/http-server/src/server.rs index a8de839a72..02b9037a26 100644 --- a/http-server/src/server.rs +++ b/http-server/src/server.rs @@ -116,7 +116,7 @@ impl Builder { /// fn on_request(&self, _remote_addr: SocketAddr, _headers: &Headers) -> Instant { /// Instant::now() /// } - /// + /// /// // Called once a single JSON-RPC method call is processed, it may be called multiple times /// // on batches. /// fn on_call(&self, method_name: &str, params: Params) { @@ -129,7 +129,7 @@ impl Builder { /// println!("Call to '{}' took {:?}", method_name, started_at.elapsed()); /// } /// - /// // Called the entire JSON-RPC is completed, called on once for both single calls or batches. + /// // Called the entire JSON-RPC is completed, called on once for both single calls or batches. /// fn on_response(&self, result: &str, started_at: Instant) { /// println!("complete JSON-RPC response: {}, took: {:?}", result, started_at.elapsed()); /// } @@ -204,11 +204,11 @@ impl Builder { pub fn health_api(mut self, path: impl Into, method: impl Into) -> Result { let path = path.into(); - if !path.starts_with("/") { + if !path.starts_with('/') { return Err(Error::Custom(format!("Health endpoint path must start with `/` to work, got: {}", path))); } - self.health_api = Some(HealthApi { path: path, method: method.into() }); + self.health_api = Some(HealthApi { path, method: method.into() }); Ok(self) } @@ -776,8 +776,7 @@ where let response = execute_call(Call { name: &req.method, params, id: req.id, call }).await; - let batch = batch_response.append(&response); - batch + batch_response.append(&response) }, ) .in_current_span() diff --git a/proc-macros/src/helpers.rs b/proc-macros/src/helpers.rs index cf6c7b92b7..5e5492c1bb 100644 --- a/proc-macros/src/helpers.rs +++ b/proc-macros/src/helpers.rs @@ -97,9 +97,9 @@ pub(crate) fn generate_where_clause( let additional_where_clause = item_trait.generics.where_clause.clone(); if let Some(custom_bounds) = bounds { - let mut bounds = additional_where_clause + let mut bounds: Vec<_> = additional_where_clause .map(|where_clause| where_clause.predicates.into_iter().collect()) - .unwrap_or(Vec::new()); + .unwrap_or_default(); bounds.extend(custom_bounds.iter().cloned()); diff --git a/ws-server/src/server.rs b/ws-server/src/server.rs index 07e07961c4..2a7f5bca1f 100644 --- a/ws-server/src/server.rs +++ b/ws-server/src/server.rs @@ -697,27 +697,27 @@ impl Builder { /// type Instant = Instant; /// /// fn on_connect(&self, remote_addr: SocketAddr, headers: &Headers) { - /// println!("[MyMiddleware::on_call] remote_addr: {}, headers: {:?}", remote_addr, headers); + /// println!("[MyMiddleware::on_call] remote_addr: {}, headers: {:?}", remote_addr, headers); /// } /// /// fn on_request(&self) -> Self::Instant { - /// Instant::now() + /// Instant::now() /// } /// /// fn on_call(&self, method_name: &str, params: Params) { - /// println!("[MyMiddleware::on_call] method: '{}' params: {:?}", method_name, params); + /// println!("[MyMiddleware::on_call] method: '{}' params: {:?}", method_name, params); /// } /// /// fn on_result(&self, method_name: &str, success: bool, started_at: Self::Instant) { - /// println!("[MyMiddleware::on_result] '{}', worked? {}, time elapsed {:?}", method_name, success, started_at.elapsed()); + /// println!("[MyMiddleware::on_result] '{}', worked? {}, time elapsed {:?}", method_name, success, started_at.elapsed()); /// } /// /// fn on_response(&self, result: &str, started_at: Self::Instant) { - /// println!("[MyMiddleware::on_response] result: {}, time elapsed {:?}", result, started_at.elapsed()); + /// println!("[MyMiddleware::on_response] result: {}, time elapsed {:?}", result, started_at.elapsed()); /// } /// /// fn on_disconnect(&self, remote_addr: SocketAddr) { - /// println!("[MyMiddleware::on_disconnect] remote_addr: {}", remote_addr); + /// println!("[MyMiddleware::on_disconnect] remote_addr: {}", remote_addr); /// } /// } ///