Fix cargo clippy warnings.

Author: brocaar

chirpstack-concentratord-2g4/src/wrapper.rs

@@ -156,8 +156,8 @@ pub fn downlink_from_proto(
         ..Default::default()
     };
 
-    if let Some(timing) = &tx_info.timing {
-        if let Some(params) = &timing.parameters {
+    if let Some(timing) = &tx_info.timing
+        && let Some(params) = &timing.parameters {
             match params {
                 gw::timing::Parameters::Immediately(_) => {
                     packet.tx_mode = hal::TxMode::Immediate;
@@ -190,10 +190,9 @@ pub fn downlink_from_proto(
                 }
             }
         }
-    }
 
-    if let Some(modulation) = &tx_info.modulation {
-        if let Some(params) = &modulation.parameters {
+    if let Some(modulation) = &tx_info.modulation
+        && let Some(params) = &modulation.parameters {
             match params {
                 gw::modulation::Parameters::Lora(v) => {
                     packet.bandwidth = v.bandwidth;
@@ -241,7 +240,6 @@ pub fn downlink_from_proto(
                 }
             }
         }
-    }
 
     Ok(packet)
 }

chirpstack-concentratord-sx1301/src/wrapper/mod.rs

@@ -210,8 +210,8 @@ pub fn downlink_from_proto(df: &gw::DownlinkFrameItem) -> Result<hal::TxPacket>
         ..Default::default()
     };
 
-    if let Some(timing) = &tx_info.timing {
-        if let Some(params) = &timing.parameters {
+    if let Some(timing) = &tx_info.timing
+        && let Some(params) = &timing.parameters {
             match params {
                 gw::timing::Parameters::Immediately(_) => {
                     packet.modulation = hal::Modulation::LoRa;
@@ -262,10 +262,9 @@ pub fn downlink_from_proto(df: &gw::DownlinkFrameItem) -> Result<hal::TxPacket>
                 }
             }
         }
-    }
 
-    if let Some(modulation) = &tx_info.modulation {
-        if let Some(params) = &modulation.parameters {
+    if let Some(modulation) = &tx_info.modulation
+        && let Some(params) = &modulation.parameters {
             match params {
                 gw::modulation::Parameters::Lora(v) => {
                     packet.modulation = hal::Modulation::LoRa;
@@ -302,7 +301,6 @@ pub fn downlink_from_proto(df: &gw::DownlinkFrameItem) -> Result<hal::TxPacket>
                 }
             }
         }
-    }
 
     Ok(packet)
 }

chirpstack-concentratord-sx1302/src/wrapper/mod.rs

@@ -202,8 +202,8 @@ pub fn downlink_from_proto(df: &gw::DownlinkFrameItem) -> Result<hal::TxPacket>
         ..Default::default()
     };
 
-    if let Some(timing) = &tx_info.timing {
-        if let Some(params) = &timing.parameters {
+    if let Some(timing) = &tx_info.timing
+        && let Some(params) = &timing.parameters {
             match params {
                 gw::timing::Parameters::Immediately(_) => {
                     packet.tx_mode = hal::TxMode::Immediate;
@@ -253,10 +253,9 @@ pub fn downlink_from_proto(df: &gw::DownlinkFrameItem) -> Result<hal::TxPacket>
                 }
             }
         }
-    }
 
-    if let Some(modulation) = &tx_info.modulation {
-        if let Some(params) = &modulation.parameters {
+    if let Some(modulation) = &tx_info.modulation
+        && let Some(params) = &modulation.parameters {
             match params {
                 gw::modulation::Parameters::Lora(v) => {
                     packet.modulation = hal::Modulation::LoRa;
@@ -293,7 +292,6 @@ pub fn downlink_from_proto(df: &gw::DownlinkFrameItem) -> Result<hal::TxPacket>
                 }
             }
         }
-    }
 
     Ok(packet)
 }

libconcentratord/src/gpsd.rs

@@ -46,15 +46,14 @@ pub fn get_reader(server: &str) -> Result<BufReader<TcpStream>> {
     debug!("Watch response: {}", String::from_utf8(b.clone())?);
 
     for device in &resp.devices {
-        if let Some(driver) = &device.driver {
-            if driver == "u-blox" {
+        if let Some(driver) = &device.driver
+            && driver == "u-blox" {
                 let config_str = format!("&{}=b5620601080001200001010000003294\r\n", device.path);
                 debug!("Configuring uBlox device {} for NAV-TIMEGPS", device.path);
                 writer.write_all(config_str.as_bytes())?;
                 writer.flush()?;
                 return Ok(reader);
             }
-        }
     }
 
     Err(anyhow!("No u-blox GNSS device found"))