Next

src/decoder/bds.rs

@@ -24,22 +24,23 @@ use super::{flag_and_range_value, range_value};
 ///
 /// A tuple containing the BDS1 and BDS2 values.
 pub fn bds(message: &[u32]) -> (u32, u32) {
-    if let (1, 0) = (message[8] & 0xF, message[9] & 0xF) {
-        if message[10] & 0x7 == 0 && message[11] & 0xC == 0 {
-            return (1, 0);
-        }
+    if let (1, 0) = (message[8] & 0xF, message[9] & 0xF)
+        && message[10] & 0x7 == 0
+        && message[11] & 0xC == 0
+    {
+        return (1, 0);
     };
 
     if let (2, 0) = (message[8] & 0xF, message[9] & 0xF) {
         return (2, 0);
     };
 
-    if let (3, 0) = (message[8] & 0xF, message[9] & 0xF) {
-        if let Some(value) = range_value(message, 48, 54) {
-            if (message[15] & 0b1100) != 0b1100 && value < 48 {
-                return (3, 0);
-            }
-        }
+    if let (3, 0) = (message[8] & 0xF, message[9] & 0xF)
+        && let Some(value) = range_value(message, 48, 54)
+        && (message[15] & 0b1100) != 0b1100
+        && value < 48
+    {
+        return (3, 0);
     };
 
     (0, 0)

src/decoder/downlink/mode_s.rs

@@ -117,10 +117,7 @@ impl decoder::Downlink for Mds {
             if let Some(result) = decoder::is_bds_1_7(message) {
                 self.capability = Some(result);
                 bds = (1, 7);
-            }
-        }
-        if bds == (0, 0) {
-            if let Some(value) = decoder::is_bds_4_0(message) {
+            } else if let Some(value) = decoder::is_bds_4_0(message) {
                 self.selected_altitude =
                     value.mcp_selected_altitude.or(value.fms_selected_altitude);
                 self.target_altitude_source = match value.target_altitude_source {
@@ -134,21 +131,15 @@ impl decoder::Downlink for Mds {
                 };
                 self.barometric_pressure_setting = value.barometric_pressure_setting;
                 bds = (4, 0);
-            }
-        }
-        if bds == (0, 0) {
-            if let Some(result) = decoder::is_bds_5_0(message) {
+            } else if let Some(result) = decoder::is_bds_5_0(message) {
                 self.roll_angle = result.roll_angle;
                 self.track = result.track_angle;
                 self.track_angle_rate = result.track_angle_rate;
                 self.grspeed = result.ground_speed;
                 self.true_airspeed = result.true_airspeed;
                 self.track_source = Some('\u{2085}');
                 bds = (5, 0);
-            }
-        }
-        if bds == (0, 0) {
-            if let Some(result) = decoder::is_bds_6_0(message) {
+            } else if let Some(result) = decoder::is_bds_6_0(message) {
                 self.heading = result.magnetic_heading;
                 self.indicated_airspeed = result.indicated_airspeed;
                 self.mach_number = result.mach_number;
@@ -164,10 +155,7 @@ impl decoder::Downlink for Mds {
                 };
                 self.heading_source = Some('\u{2086}');
                 bds = (6, 0);
-            }
-        }
-        if bds == (0, 0) {
-            if let Some(meteo) = decoder::is_bds_4_4(message) {
+            } else if let Some(meteo) = decoder::is_bds_4_4(message) {
                 self.temperature = meteo.temp;
                 if meteo.wind.is_some() {
                     self.wind = meteo.wind;
@@ -176,11 +164,10 @@ impl decoder::Downlink for Mds {
                 self.turbulence = meteo.turbulence;
                 self.pressure = meteo.pressure;
                 bds = (4, 4);
+            } else {
+                self.temperature = decoder::is_bds_4_5(message);
             }
         }
-        if bds == (0, 0) {
-            self.temperature = decoder::is_bds_4_5(message);
-        }
         debug!("DF:{} BDS:{}.{}", self.df.unwrap_or(0), bds.0, bds.1);
     }
 

src/decoder/plane/from_downlink/from_ext.rs

@@ -56,10 +56,10 @@ impl Plane {
     fn amend_from_ext_19(&mut self, dl: &Ext) {
         self.vrate = dl.vrate;
         self.vrate_source = ' ';
-        if let Some(altitude_delta) = dl.altitude_delta {
-            if let Some(altitude) = self.altitude {
-                self.altitude_gnss = Some((altitude as i32 + altitude_delta) as u32);
-            }
+        if let Some(altitude_delta) = dl.altitude_delta
+            && let Some(altitude) = self.altitude
+        {
+            self.altitude_gnss = Some((altitude as i32 + altitude_delta) as u32);
         }
         match dl.message_type.1 {
             1 => {

src/decoder/plane/from_downlink/from_srt.rs

@@ -10,10 +10,10 @@ impl UpdateFromDownlink<Srt> for Plane {
             if dl.df == Some(5) && dl.squawk.is_some() {
                 self.squawk = dl.squawk;
             }
-            if dl.df == Some(11) {
-                if let Some(v) = dl.capability {
-                    self.capability.0 = v;
-                }
+            if dl.df == Some(11)
+                && let Some(v) = dl.capability
+            {
+                self.capability.0 = v;
             }
         }
     }

src/decoder/plane/from_squitter/from_ext.rs

@@ -72,10 +72,10 @@ impl Plane {
     pub(super) fn update_from_ext_19(&mut self, message: &[u32], message_subtype: u32) {
         self.vrate = decoder::vertical_rate(message);
         self.vrate_source = ' ';
-        if let Some(altitude) = self.altitude {
-            if let Some(altitude_delta) = decoder::altitude_delta(message) {
-                self.altitude_gnss = Some((altitude as i32 + altitude_delta) as u32);
-            }
+        if let Some(altitude) = self.altitude
+            && let Some(altitude_delta) = decoder::altitude_delta(message)
+        {
+            self.altitude_gnss = Some((altitude as i32 + altitude_delta) as u32);
         }
         match message_subtype {
             1 => {