From ed526fc648d65c0908ffd7ce8099a3f8f16023df Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:25:29 +0000 Subject: [PATCH 1/8] lint --- src/decoder/downlink/mode_s.rs | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/decoder/downlink/mode_s.rs b/src/decoder/downlink/mode_s.rs index 70f413f..2fa8145 100644 --- a/src/decoder/downlink/mode_s.rs +++ b/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,10 +131,7 @@ 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; @@ -145,10 +139,7 @@ impl decoder::Downlink for Mds { 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); } From 43a44bdab7660e5316ca4e86c86cc3455eb6a4ef Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:27:52 +0000 Subject: [PATCH 2/8] lint --- src/decoder/bds.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/decoder/bds.rs b/src/decoder/bds.rs index de564f9..9a833a9 100644 --- a/src/decoder/bds.rs +++ b/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) From 0ad079e569b1f757d476a0d66f6731126eb0984c Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:28:42 +0000 Subject: [PATCH 3/8] lint --- src/decoder/plane/update_position.rs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/decoder/plane/update_position.rs b/src/decoder/plane/update_position.rs index aed3fec..ddb8469 100644 --- a/src/decoder/plane/update_position.rs +++ b/src/decoder/plane/update_position.rs @@ -29,22 +29,21 @@ impl Plane { .num_seconds() .abs() < 10 - { - if let Some((lat, lon)) = match message_type { + && let Some((lat, lon)) = match message_type { 5..=8 => decoder::cpr_location(&self.cpr_lat, &self.cpr_lon, cpr_form, 4), 9..=18 => decoder::cpr_location(&self.cpr_lat, &self.cpr_lon, cpr_form, 1), _ => None, - } { - if (-90.0..=90.0).contains(&lat) && (-180.0..=180.0).contains(&lon) { - self.lat = lat; - self.lon = lon; - if let Some(observer) = decoder::observer::get_observer_coords() { - self.distance_from_observer = - Some(haversine(self.lat, self.lon, observer.0, observer.1)); - }; - self.position_timestamp = Some(self.timestamp); - } } + && (-90.0..=90.0).contains(&lat) + && (-180.0..=180.0).contains(&lon) + { + self.lat = lat; + self.lon = lon; + if let Some(observer) = decoder::observer::get_observer_coords() { + self.distance_from_observer = + Some(haversine(self.lat, self.lon, observer.0, observer.1)); + }; + self.position_timestamp = Some(self.timestamp); } } } From 0341b79bc1bcefd2e2a5254f5da24d0d63e2e952 Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:30:19 +0000 Subject: [PATCH 4/8] lint --- src/decoder/plane/from_downlink/from_ext.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/decoder/plane/from_downlink/from_ext.rs b/src/decoder/plane/from_downlink/from_ext.rs index a269fd6..87ca2df 100644 --- a/src/decoder/plane/from_downlink/from_ext.rs +++ b/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 => { From acc0c24a5d256cdcb9b253f1b8e933bd880c716c Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:30:50 +0000 Subject: [PATCH 5/8] lint --- src/decoder/plane/from_downlink/from_srt.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/decoder/plane/from_downlink/from_srt.rs b/src/decoder/plane/from_downlink/from_srt.rs index 5bcb7e8..c266d19 100644 --- a/src/decoder/plane/from_downlink/from_srt.rs +++ b/src/decoder/plane/from_downlink/from_srt.rs @@ -10,10 +10,10 @@ impl UpdateFromDownlink 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; } } } From 14fc99584990bdeb6819a99f9e86e48c726c45b6 Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:31:09 +0000 Subject: [PATCH 6/8] lint --- src/decoder/plane/from_squitter/from_ext.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/decoder/plane/from_squitter/from_ext.rs b/src/decoder/plane/from_squitter/from_ext.rs index db77ffd..66f1eab 100644 --- a/src/decoder/plane/from_squitter/from_ext.rs +++ b/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 => { From 29fe537b7d43fec3c74883a3940becaef542098b Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:40:32 +0000 Subject: [PATCH 7/8] lint --- .../plane/from_squitter/from_mode_s.rs | 64 +++++++++---------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/src/decoder/plane/from_squitter/from_mode_s.rs b/src/decoder/plane/from_squitter/from_mode_s.rs index 55fda4d..6f1eac8 100644 --- a/src/decoder/plane/from_squitter/from_mode_s.rs +++ b/src/decoder/plane/from_squitter/from_mode_s.rs @@ -12,26 +12,28 @@ impl Plane { if bds == (3, 0) { self.threat_encounter = decoder::threat_encounter(message); } - if bds == (0, 0) { - if let Some(result) = decoder::is_bds_1_7(message) { - self.capability.1 = result; - bds = (1, 7); - debug!("Relaxed:{}", relaxed); - debug!( - "DF:{}, BDS:{}.{}, C:{:b} 4:{} 4.4:{} 5:{} 6:{}", - df, - bds.0, - bds.1, - self.capability.1.flags, - self.capability.1.bds40, - self.capability.1.bds44, - self.capability.1.bds50, - self.capability.1.bds60 - ); - } + if bds == (0, 0) + && let Some(result) = decoder::is_bds_1_7(message) + { + self.capability.1 = result; + bds = (1, 7); + debug!("Relaxed:{}", relaxed); + debug!( + "DF:{}, BDS:{}.{}, C:{:b} 4:{} 4.4:{} 5:{} 6:{}", + df, + bds.0, + bds.1, + self.capability.1.flags, + self.capability.1.bds40, + self.capability.1.bds44, + self.capability.1.bds50, + self.capability.1.bds60 + ); } - if bds == (0, 0) && (relaxed || self.capability.1.bds40) { - if let Some(value) = decoder::is_bds_4_0(message) { + if bds == (0, 0) { + if (relaxed || self.capability.1.bds40) + && 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 { @@ -52,10 +54,9 @@ impl Plane { bds.1, value.target_altitude_source.unwrap_or(0) ); - } - } - if bds == (0, 0) && (relaxed || self.capability.1.bds50) { - if let Some(result) = decoder::is_bds_5_0(message) { + } else if (relaxed || self.capability.1.bds50) + && 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; @@ -66,10 +67,9 @@ impl Plane { self.track_timestamp = Some(self.timestamp); bds = (5, 0); debug!("DF:{}, BDS:{}.{}", df, bds.0, bds.1); - } - } - if bds == (0, 0) && (relaxed || self.capability.1.bds60) { - if let Some(result) = decoder::is_bds_6_0(message) { + } else if (relaxed || self.capability.1.bds60) + && 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; @@ -87,10 +87,7 @@ impl Plane { self.heading_timestamp = Some(self.timestamp); bds = (6, 0); debug!("DF:{}, BDS:{}.{}", df, bds.0, bds.1); - } - } - 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; @@ -100,10 +97,7 @@ impl Plane { self.pressure = meteo.pressure; bds = (4, 4); debug!("DF:{} B:4.4 FOM:{:b}", df, message[8] & 0xF); - } - } - if bds == (0, 0) { - if let Some(value) = decoder::is_bds_4_5(message) { + } else if let Some(value) = decoder::is_bds_4_5(message) { self.temperature = Some(value) } } From abc71abeb2a57b8c60b2b34ad5b7f77ab88adaa6 Mon Sep 17 00:00:00 2001 From: Tony C Sidrock Date: Sat, 14 Feb 2026 13:40:51 +0000 Subject: [PATCH 8/8] lint --- Cargo.lock | 88 +++++++++++++++++++++++++-------------------------- src/main.rs | 9 ++---- src/reader.rs | 16 +++++----- 3 files changed, 54 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7185a68..29df6b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,9 +84,9 @@ checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "cc" -version = "1.2.53" +version = "1.2.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932" +checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" dependencies = [ "find-msvc-tools", "shlex", @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.54" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" +checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806" dependencies = [ "clap_builder", "clap_derive", @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.54" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" +checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2" dependencies = [ "anstream", "anstyle", @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.49" +version = "4.5.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" +checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" dependencies = [ "heck", "proc-macro2", @@ -147,9 +147,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" [[package]] name = "colorchoice" @@ -165,9 +165,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "env_filter" -version = "0.1.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" +checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f" dependencies = [ "log", "regex", @@ -175,9 +175,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d" dependencies = [ "anstream", "anstyle", @@ -188,9 +188,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "heck" @@ -200,9 +200,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" -version = "0.1.64" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -230,9 +230,9 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "jiff" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50" +checksum = "c867c356cc096b33f4981825ab281ecba3db0acefe60329f044c1789d94c6543" dependencies = [ "jiff-static", "log", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78" +checksum = "f7946b4325269738f270bb55b3c19ab5c5040525f83fd625259422a9d25d9be5" dependencies = [ "proc-macro2", "quote", @@ -270,9 +270,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.180" +version = "0.2.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" [[package]] name = "log" @@ -282,9 +282,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "num-traits" @@ -309,42 +309,42 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "portable-atomic" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5" dependencies = [ "portable-atomic", ] [[package]] name = "proc-macro2" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -365,9 +365,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" [[package]] name = "rustversion" @@ -420,9 +420,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.114" +version = "2.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12" dependencies = [ "proc-macro2", "quote", @@ -431,9 +431,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e" [[package]] name = "utf8parse" diff --git a/src/main.rs b/src/main.rs index 30c37bb..76b2132 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use squitterator::{ - initialize_logger, set_observer_coords_from_str, spawn_reader_thread, AppResult, Args, Planes, + AppResult, Args, Planes, initialize_logger, set_observer_coords_from_str, spawn_reader_thread, }; use clap::Parser; @@ -25,12 +25,7 @@ fn main() -> AppResult<()> { // Wait for the reader thread to complete reader_thread .join() - .map_err(|_| { - std::io::Error::new( - std::io::ErrorKind::Other, - "Failed to join reader thread: thread panicked", - ) - })? + .map_err(|_| std::io::Error::other("Failed to join reader thread: thread panicked"))? .map_err(|e| { error!("Reader thread error: {}", e); e diff --git a/src/reader.rs b/src/reader.rs index 183a3c4..79daa0d 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -43,16 +43,16 @@ fn read_lines(reader: R, args: &Args, planes: &mut Planes) -> Result continue; }; - if let Some(m) = &args.log_messages { - if m.contains(&df) { - error!("DF:{}, L:{}", df, line); - } + if let Some(m) = &args.log_messages + && m.contains(&df) + { + error!("DF:{}, L:{}", df, line); } - if let Some(only) = &args.filter { - if only.iter().all(|&x| x != df) { - continue; - } + if let Some(only) = &args.filter + && only.iter().all(|&x| x != df) + { + continue; } if args.count_df {