proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-10-04 21:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc clippy fixes

Browse Source 
the trivial ones ;)

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-02-08 14:57:16 +01:00
parent 645b2ae89b
commit bb7018e183
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxmox-rest-server/examples/minimal-rest-server.rs
View File

@ -80,7 +80,7 @@ lazy_static! {
#[api] #[api]
/// Lists all current items /// Lists all current items
fn list_items() -> Result<Vec<String>, Error> { fn list_items() -> Result<Vec<String>, Error> {
Ok(ITEM_MAP.lock().unwrap().keys().map(|k| k.clone()).collect()) Ok(ITEM_MAP.lock().unwrap().keys().cloned().collect())
} }
#[api( #[api(

4
proxmox-rest-server/src/api_config.rs
View File

@ -206,7 +206,7 @@ impl ApiConfig {
let logger_options = FileLogOptions { let logger_options = FileLogOptions {
append: true, append: true,
file_opts: file_opts.unwrap_or(CreateOptions::default()), file_opts: file_opts.unwrap_or_default(),
..Default::default() ..Default::default()
}; };
let request_log = Arc::new(Mutex::new(FileLogger::new(&path, logger_options)?)); let request_log = Arc::new(Mutex::new(FileLogger::new(&path, logger_options)?));
@ -246,7 +246,7 @@ impl ApiConfig {
let logger_options = FileLogOptions { let logger_options = FileLogOptions {
append: true, append: true,
prefix_time: true, prefix_time: true,
file_opts: file_opts.unwrap_or(CreateOptions::default()), file_opts: file_opts.unwrap_or_default(),
..Default::default() ..Default::default()
}; };
let auth_log = Arc::new(Mutex::new(FileLogger::new(&path, logger_options)?)); let auth_log = Arc::new(Mutex::new(FileLogger::new(&path, logger_options)?));

2
proxmox-rest-server/src/lib.rs
View File

@ -205,7 +205,7 @@ pub fn extract_cookie(cookie: &str, cookie_name: &str) -> Option<String> {
/// We assume cookie_name is already url encoded. /// We assume cookie_name is already url encoded.
pub fn cookie_from_header(headers: &http::HeaderMap, cookie_name: &str) -> Option<String> { pub fn cookie_from_header(headers: &http::HeaderMap, cookie_name: &str) -> Option<String> {
if let Some(Ok(cookie)) = headers.get("COOKIE").map(|v| v.to_str()) { if let Some(Ok(cookie)) = headers.get("COOKIE").map(|v| v.to_str()) {
extract_cookie(&cookie, cookie_name) extract_cookie(cookie, cookie_name)
} else { } else {
None None
} }

2
proxmox-rest-server/src/rest.rs
View File

@ -377,7 +377,7 @@ async fn get_request_parameters<S: 'static + BuildHasher + Send>(
} }
} }
param_schema.verify_json(&params)?; param_schema.verify_json(&params)?;
return Ok(params); Ok(params)
} else { } else {
parse_query_parameters(param_schema, utf8_data, &parts, &uri_param) parse_query_parameters(param_schema, utf8_data, &parts, &uri_param)
} }

2
proxmox-rest-server/src/worker_task.rs
View File

@ -901,7 +901,7 @@ impl WorkerTask {
pub fn request_abort(&self) { pub fn request_abort(&self) {
let prev_abort = self.abort_requested.swap(true, Ordering::SeqCst); let prev_abort = self.abort_requested.swap(true, Ordering::SeqCst);
if !prev_abort { // log abort one time if !prev_abort { // log abort one time
self.log_message(format!("received abort request ...")); self.log_message("received abort request ...".to_string());
} }
// noitify listeners // noitify listeners
let mut data = self.data.lock().unwrap(); let mut data = self.data.lock().unwrap();