(MAINT) Fix clippy for sshdconfig

Author: michaeltlombardi

resources/sshdconfig/src/export.rs

@@ -19,8 +19,8 @@ pub fn invoke_export(input: Option<&String>, compare: bool) -> Result<Map<String
         let mut exist = false;
 
         for (keyword, input_value) in &cmd_info.input {
-            if !CanonicalProperties::is_canonical(keyword) {
-                if let Some(actual_value) = result.get(keyword) {
+            if !CanonicalProperties::is_canonical(keyword)
+                && let Some(actual_value) = result.get(keyword) {
                     if let Value::Array(entries) = actual_value {
                         // As more keywords are supported, different structured formats may be needed.
                         if let Ok(entry) = serde_json::from_value::<NameValueEntry>(input_value.clone()) {
@@ -36,7 +36,6 @@ pub fn invoke_export(input: Option<&String>, compare: bool) -> Result<Map<String
                         }
                     }
                 }
-            }
             // The only result should be the input to match the expected output for DSC
             result.insert(keyword.clone(), input_value.clone());
         }

resources/sshdconfig/src/formatter.rs

@@ -41,12 +41,10 @@ impl<'a> SshdConfigValue<'a> {
             ));
         }
 
-        if let Value::Array(arr) = value {
-            if arr.is_empty() {
-                return Err(SshdConfigError::ParserError(
-                    t!("formatter.invalidValue", key = key).to_string()
-                ));
-            }
+        if let Value::Array(arr) = value && arr.is_empty() {
+            return Err(SshdConfigError::ParserError(
+                t!("formatter.invalidValue", key = key).to_string()
+            ));
         }
 
         let mut keyword_info = KeywordInfo::from_keyword(key);

resources/sshdconfig/src/get.rs

@@ -144,10 +144,8 @@ pub fn get_sshd_settings(cmd_info: &CommandInfo, is_get: bool) -> Result<Map<Str
         // Update inherited_defaults with any keys that are not explicitly set
         // check result for any keys that are in defaults
         for (key, value) in &result {
-            if let Some(default) = defaults.get(key) {
-                if default == value {
-                    inherited_defaults.push(key.clone());
-                }
+            if let Some(default) = defaults.get(key) && default == value {
+                inherited_defaults.push(key.clone());
             }
         }
     } else {

resources/sshdconfig/src/parser.rs

@@ -180,23 +180,19 @@ impl SshdConfigParser {
         }
 
         // Validate that structured keywords cannot use operators
-        if let Some(ref info) = keyword_info {
-            if !info.allows_operator() && operator.is_some() {
-                return Err(SshdConfigError::ParserError(
-                    t!("parser.structuredKeywordCannotUseOperator", keyword = &info.name).to_string()
-                ));
-            }
+        if let Some(ref info) = keyword_info && !info.allows_operator() && operator.is_some() {
+            return Err(SshdConfigError::ParserError(
+                t!("parser.structuredKeywordCannotUseOperator", keyword = &info.name).to_string()
+            ));
         }
 
         for node in keyword_node.named_children(&mut cursor) {
             if node.is_error() {
                 return Err(SshdConfigError::ParserError(t!("parser.failedToParseNode", input = input).to_string()));
             }
-            if node.kind() == "arguments" {
-                if let Some(ref info) = keyword_info {
-                    value = parse_arguments_node(node, input, input_bytes, info)?;
-                    debug!("{}: {:?}", t!("parser.valueDebug").to_string(), value);
-                }
+            if node.kind() == "arguments" && let Some(ref info) = keyword_info {
+                value = parse_arguments_node(node, input, input_bytes, info)?;
+                debug!("{}: {:?}", t!("parser.valueDebug").to_string(), value);
             }
         }
 

resources/sshdconfig/src/repeat_keyword.rs

@@ -244,8 +244,8 @@ pub fn parse_and_validate_entries(entries_array: &[Value]) -> Result<Vec<NameVal
 /// or `None` if no matching entry exists.
 pub fn find_name_value_entry_index(keyword_array: &[Value], entry_name: &str, match_value: Option<&str>) -> Option<usize> {
     keyword_array.iter().position(|item| {
-        if let Value::Object(obj) = item {
-            if let Some(Value::String(name)) = obj.get("name") {
+        if let Value::Object(obj) = item
+            && let Some(Value::String(name)) = obj.get("name") {
                 if name != entry_name {
                     return false;
                 }
@@ -260,7 +260,7 @@ pub fn find_name_value_entry_index(keyword_array: &[Value], entry_name: &str, ma
 
                 return true;
             }
-        }
+
         false
     })
 }
@@ -324,9 +324,8 @@ pub fn add_or_update_entry(config: &mut Map<String, Value>, keyword: &str, entry
 /// * `keyword` - The keyword name (e.g., "subsystem")
 /// * `entry_name` - The name of the entry to remove
 pub fn remove_entry(config: &mut Map<String, Value>, keyword: &str, entry_name: &str) {
-    if let Some(Value::Array(arr)) = config.get_mut(keyword) {
-        if let Some(index) = find_name_value_entry_index(arr, entry_name, None) {
+    if let Some(Value::Array(arr)) = config.get_mut(keyword)
+        && let Some(index) = find_name_value_entry_index(arr, entry_name, None) {
             arr.remove(index);
         }
-    }
 }