fix: 修复clippy警告

Author: HalfSweet

sftool/src/config.rs

@@ -267,15 +267,15 @@ impl SfToolConfig {
             if stub_sub_count != 1 {
                 return Err("stub must contain exactly one of write, clear, or read".to_string());
             }
-            if let Some(ref stub_write) = stub.write {
-                if stub_write.files.is_empty() {
-                    return Err("stub.write.files must not be empty".to_string());
-                }
+            if let Some(ref stub_write) = stub.write
+                && stub_write.files.is_empty()
+            {
+                return Err("stub.write.files must not be empty".to_string());
             }
-            if let Some(ref stub_clear) = stub.clear {
-                if stub_clear.files.is_empty() {
-                    return Err("stub.clear.files must not be empty".to_string());
-                }
+            if let Some(ref stub_clear) = stub.clear
+                && stub_clear.files.is_empty()
+            {
+                return Err("stub.clear.files must not be empty".to_string());
             }
             if let Some(ref stub_read) = stub.read {
                 if stub_read.files.is_empty() {

sftool/src/main.rs

@@ -66,11 +66,11 @@ fn main() -> Result<()> {
             return Ok(());
         }
         CommandSource::Config(cfg) => {
-            if let Some(stub) = &cfg.stub {
-                if stub.write.is_some() || stub.clear.is_some() || stub.read.is_some() {
-                    execute_stub_config_command(cfg)?;
-                    return Ok(());
-                }
+            if let Some(stub) = &cfg.stub
+                && (stub.write.is_some() || stub.clear.is_some() || stub.read.is_some())
+            {
+                execute_stub_config_command(cfg)?;
+                return Ok(());
             }
         }
         _ => {}

sftool/src/stub_config_spec.rs

@@ -197,17 +197,14 @@ impl StubConfigSpec {
             })
             .collect::<Result<Vec<_>>>()?;
 
-        let pmic = match &self.pmic {
-            Some(pmic) => Some(lib::PmicConfig {
-                disabled: pmic.disabled,
-                scl_port: pmic.scl_port.into(),
-                scl_pin: pmic.scl_pin,
-                sda_port: pmic.sda_port.into(),
-                sda_pin: pmic.sda_pin,
-                channels: pmic.channels.iter().map(|c| (*c).into()).collect(),
-            }),
-            None => None,
-        };
+        let pmic = self.pmic.as_ref().map(|pmic| lib::PmicConfig {
+            disabled: pmic.disabled,
+            scl_port: pmic.scl_port.into(),
+            scl_pin: pmic.scl_pin,
+            sda_port: pmic.sda_port.into(),
+            sda_pin: pmic.sda_pin,
+            channels: pmic.channels.iter().map(|c| (*c).into()).collect(),
+        });
 
         let sd0 = match &self.sd0 {
             Some(sd0) => Some(lib::Sd0Config {