From 4597eedf131d922cfdb16d5433c3b298b258fefe Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 27 Jul 2022 15:22:09 +0200 Subject: [PATCH] config: clippy fixes Signed-off-by: Wolfgang Bumiller --- pbs-config/src/datastore.rs | 2 +- pbs-config/src/domains.rs | 4 ++-- pbs-config/src/drive.rs | 6 +++--- pbs-config/src/media_pool.rs | 2 +- pbs-config/src/metrics.rs | 2 +- pbs-config/src/network/lexer.rs | 2 +- pbs-config/src/network/mod.rs | 4 ++-- pbs-config/src/prune.rs | 2 +- pbs-config/src/remote.rs | 2 +- pbs-config/src/sync.rs | 2 +- pbs-config/src/tape_job.rs | 2 +- pbs-config/src/traffic_control.rs | 2 +- pbs-config/src/user.rs | 2 +- pbs-config/src/verify.rs | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pbs-config/src/datastore.rs b/pbs-config/src/datastore.rs index 88dd0c343..c89cc5ab7 100644 --- a/pbs-config/src/datastore.rs +++ b/pbs-config/src/datastore.rs @@ -59,7 +59,7 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_datastore_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/domains.rs b/pbs-config/src/domains.rs index bb236dc29..4a44180b6 100644 --- a/pbs-config/src/domains.rs +++ b/pbs-config/src/domains.rs @@ -56,7 +56,7 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_realm_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } @@ -73,6 +73,6 @@ pub fn complete_openid_realm_name(_arg: &str, _param: &HashMap) } }) .collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/drive.rs b/pbs-config/src/drive.rs index 9ee79b765..630127a59 100644 --- a/pbs-config/src/drive.rs +++ b/pbs-config/src/drive.rs @@ -101,7 +101,7 @@ pub fn check_drive_exists(config: &SectionConfigData, drive: &str) -> Result<(), pub fn complete_drive_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } @@ -114,7 +114,7 @@ pub fn complete_lto_drive_name(_arg: &str, _param: &HashMap) -> .filter(|(_id, (section_type, _))| section_type == "lto") .map(|(id, _)| id.to_string()) .collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } @@ -127,6 +127,6 @@ pub fn complete_changer_name(_arg: &str, _param: &HashMap) -> Ve .filter(|(_id, (section_type, _))| section_type == "changer") .map(|(id, _)| id.to_string()) .collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/media_pool.rs b/pbs-config/src/media_pool.rs index 46b569889..c2200df17 100644 --- a/pbs-config/src/media_pool.rs +++ b/pbs-config/src/media_pool.rs @@ -68,6 +68,6 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_pool_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/metrics.rs b/pbs-config/src/metrics.rs index 272908821..219c717b4 100644 --- a/pbs-config/src/metrics.rs +++ b/pbs-config/src/metrics.rs @@ -65,7 +65,7 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_remote_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.keys().cloned().collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/network/lexer.rs b/pbs-config/src/network/lexer.rs index d064662a5..fd23e3d8c 100644 --- a/pbs-config/src/network/lexer.rs +++ b/pbs-config/src/network/lexer.rs @@ -4,7 +4,7 @@ use std::iter::Iterator; use lazy_static::lazy_static; -#[derive(Debug, Copy, Clone, PartialEq)] +#[derive(Debug, Copy, Clone, Eq, PartialEq)] pub enum Token { Text, Comment, diff --git a/pbs-config/src/network/mod.rs b/pbs-config/src/network/mod.rs index 5cb784e1b..66975391e 100644 --- a/pbs-config/src/network/mod.rs +++ b/pbs-config/src/network/mod.rs @@ -501,7 +501,7 @@ pub fn save_config(config: &NetworkConfig) -> Result<(), Error> { pub fn complete_interface_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.interfaces.keys().map(|id| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } @@ -515,7 +515,7 @@ pub fn complete_port_list(arg: &str, _param: &HashMap) -> Vec return vec![], + Err(_) => return Vec::new(), }; let arg = arg.trim(); diff --git a/pbs-config/src/prune.rs b/pbs-config/src/prune.rs index 0680d399d..f88292dd3 100644 --- a/pbs-config/src/prune.rs +++ b/pbs-config/src/prune.rs @@ -52,6 +52,6 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_prune_job_id(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/remote.rs b/pbs-config/src/remote.rs index a9db1efc1..0b78b8168 100644 --- a/pbs-config/src/remote.rs +++ b/pbs-config/src/remote.rs @@ -54,6 +54,6 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_remote_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/sync.rs b/pbs-config/src/sync.rs index 465e56f3f..1455ac905 100644 --- a/pbs-config/src/sync.rs +++ b/pbs-config/src/sync.rs @@ -53,6 +53,6 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_sync_job_id(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/tape_job.rs b/pbs-config/src/tape_job.rs index 31343a778..5ec2eb533 100644 --- a/pbs-config/src/tape_job.rs +++ b/pbs-config/src/tape_job.rs @@ -55,6 +55,6 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_tape_job_id(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/traffic_control.rs b/pbs-config/src/traffic_control.rs index 0fb0f07ed..673506271 100644 --- a/pbs-config/src/traffic_control.rs +++ b/pbs-config/src/traffic_control.rs @@ -68,7 +68,7 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_traffic_control_name(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/user.rs b/pbs-config/src/user.rs index 1400914ba..4db906c9e 100644 --- a/pbs-config/src/user.rs +++ b/pbs-config/src/user.rs @@ -157,7 +157,7 @@ pub fn complete_userid(_arg: &str, _param: &HashMap) -> Vec return vec![], + Err(_) => Vec::new(), } } diff --git a/pbs-config/src/verify.rs b/pbs-config/src/verify.rs index 84cec732f..b0d3babc9 100644 --- a/pbs-config/src/verify.rs +++ b/pbs-config/src/verify.rs @@ -57,6 +57,6 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn complete_verification_job_id(_arg: &str, _param: &HashMap) -> Vec { match config() { Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(), - Err(_) => return vec![], + Err(_) => Vec::new(), } }