diff --git a/pbs-config/src/datastore.rs b/pbs-config/src/datastore.rs
index 88dd0c34..c89cc5ab 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<String, String>) -> Vec<String> {
     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 bb236dc2..4a44180b 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<String, String>) -> Vec<String> {
     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<String, String>)
                 }
             })
             .collect(),
-        Err(_) => return vec![],
+        Err(_) => Vec::new(),
     }
 }
diff --git a/pbs-config/src/drive.rs b/pbs-config/src/drive.rs
index 9ee79b76..630127a5 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<String, String>) -> Vec<String> {
     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<String, String>) ->
             .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<String, String>) -> 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 46b56988..c2200df1 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<String, String>) -> Vec<String> {
     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 27290882..219c717b 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<String, String>) -> Vec<String> {
     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 d064662a..fd23e3d8 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 5cb784e1..66975391 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<String, String>) -> Vec<String> {
     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<String, String>) -> Vec<St
                 }
             }
         }
-        Err(_) => 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 0680d399..f88292dd 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<String, String>) -> Vec<String> {
     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 a9db1efc..0b78b816 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<String, String>) -> Vec<String> {
     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 465e56f3..1455ac90 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<String, String>) -> Vec<String> {
     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 31343a77..5ec2eb53 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<String, String>) -> Vec<String> {
     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 0fb0f07e..67350627 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<String, String>) -> Vec<String> {
     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 1400914b..4db906c9 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<String, String>) -> Vec<Stri
                 }
             })
             .collect(),
-        Err(_) => return vec![],
+        Err(_) => Vec::new(),
     }
 }
 
diff --git a/pbs-config/src/verify.rs b/pbs-config/src/verify.rs
index 84cec732..b0d3babc 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<String, String>) -> Vec<String> {
     match config() {
         Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
-        Err(_) => return vec![],
+        Err(_) => Vec::new(),
     }
 }