From 40acfdf04ce5c018643825fd1d0db8bd96086667 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Sat, 26 Oct 2019 11:36:01 +0200 Subject: [PATCH] avoid some clippy warnings --- src/server/rest.rs | 26 +++++++++++++------------- src/server/state.rs | 7 +------ src/tools/daemon.rs | 3 ++- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index af3b74b2..d91b2621 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -1,4 +1,5 @@ use std::collections::HashMap; +use std::hash::BuildHasher; use std::path::{Path, PathBuf}; use std::pin::Pin; use std::sync::Arc; @@ -119,7 +120,7 @@ impl tower_service::Service> for ApiService { let path = req.uri().path().to_owned(); let method = req.method().clone(); - let peer = self.peer.clone(); + let peer = self.peer; Pin::from(handle_request(self.api_config.clone(), req)) .map(move |result| match result { Ok(res) => { @@ -144,11 +145,11 @@ impl tower_service::Service> for ApiService { } } -fn get_request_parameters_async( +fn get_request_parameters_async( info: &'static ApiMethod, parts: Parts, req_body: Body, - uri_param: HashMap, + uri_param: HashMap, ) -> Box> + Send> { let mut is_json = false; @@ -162,7 +163,7 @@ fn get_request_parameters_async( is_json = true; } _ => { - return Box::new(future::err(http_err!(BAD_REQUEST, format!("unsupported content type")))); + return Box::new(future::err(http_err!(BAD_REQUEST, "unsupported content type".to_string()))); } } } @@ -174,7 +175,7 @@ fn get_request_parameters_async( acc.extend_from_slice(&*chunk); Ok(acc) } else { - Err(http_err!(BAD_REQUEST, format!("Request body too large"))) + Err(http_err!(BAD_REQUEST, "Request body too large".to_string())) } }) .and_then(move |body| async move { @@ -195,11 +196,10 @@ fn get_request_parameters_async( let mut param_list: Vec<(String, String)> = vec![]; - if utf8.len() > 0 { + if !utf8.is_empty() { for (k, v) in form_urlencoded::parse(utf8.as_bytes()).into_owned() { param_list.push((k, v)); } - } if let Some(query_str) = parts.uri.query() { @@ -260,13 +260,13 @@ fn proxy_protected_request( }) } -pub fn handle_sync_api_request( +pub fn handle_sync_api_request( mut rpcenv: Env, info: &'static ApiMethod, formatter: &'static OutputFormatter, parts: Parts, req_body: Body, - uri_param: HashMap, + uri_param: HashMap, ) -> BoxFut { let params = get_request_parameters_async(info, parts, req_body, uri_param); @@ -339,7 +339,7 @@ pub fn handle_async_api_request( match (info.handler)(parts, req_body, params, info, Box::new(rpcenv)) { Ok(future) => future, Err(err) => { - let resp = (formatter.format_error)(Error::from(err)); + let resp = (formatter.format_error)(err); Box::new(future::ok(resp)) } } @@ -348,9 +348,9 @@ pub fn handle_async_api_request( fn get_index(username: Option, token: Option) -> Response { let nodename = proxmox::tools::nodename(); - let username = username.unwrap_or(String::from("")); + let username = username.unwrap_or_else(|| String::from("")); - let token = token.unwrap_or(String::from("")); + let token = token.unwrap_or_else(|| String::from("")); let setup = json!({ "Setup": { "auth_cookie_name": "PBSAuthCookie" }, @@ -614,7 +614,7 @@ pub fn handle_request(api: Arc, req: Request) -> BoxFut { // not Auth required for accessing files! if method != hyper::Method::GET { - return Box::new(future::err(http_err!(BAD_REQUEST, format!("Unsupported method")))); + return Box::new(future::err(http_err!(BAD_REQUEST, "Unsupported method".to_string()))); } if comp_len == 0 { diff --git a/src/server/state.rs b/src/server/state.rs index 8236ea6a..dd1c9fda 100644 --- a/src/server/state.rs +++ b/src/server/state.rs @@ -22,7 +22,6 @@ pub struct ServerState { pub reload_request: bool, } - lazy_static! { static ref SERVER_STATE: Mutex = Mutex::new(ServerState { mode: ServerMode::Normal, @@ -69,11 +68,7 @@ pub fn server_state_init() -> Result<(), Error> { pub fn is_reload_request() -> bool { let data = SERVER_STATE.lock().unwrap(); - if data.mode == ServerMode::Shutdown && data.reload_request { - true - } else { - false - } + data.mode == ServerMode::Shutdown && data.reload_request } pub fn server_shutdown() { diff --git a/src/tools/daemon.rs b/src/tools/daemon.rs index 97215d54..febca8bd 100644 --- a/src/tools/daemon.rs +++ b/src/tools/daemon.rs @@ -28,6 +28,7 @@ pub trait Reloadable: Sized { /// Manages things to be stored and reloaded upon reexec. /// Anything which should be restorable should be instantiated via this struct's `restore` method, +#[derive(Default)] pub struct Reloader { pre_exec: Vec, } @@ -241,7 +242,7 @@ where } if let Err(e) = reloader.take().unwrap().fork_restart() { log::error!("error during reload: {}", e); - let _ = systemd_notify(SystemdNotify::Status(format!("error during reload"))); + let _ = systemd_notify(SystemdNotify::Status("error during reload".to_string())); } } else { log::info!("daemon shutting down...");