Replace unpack! macro with let-chain

Next rust version is going to come out within a couple of weeks where
this feature is stable.

Author: untitaker

lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rayhunter"
 version = "0.2.8"
-edition = "2021"
+edition = "2024"
 description = "Realtime cellular data decoding and analysis for IMSI catcher detection"
 
 

lib/src/analysis/connection_redirect_downgrade.rs

@@ -2,7 +2,6 @@ use std::borrow::Cow;
 
 use super::analyzer::{Analyzer, Event, EventType, Severity};
 use super::information_element::{InformationElement, LteInformationElement};
-use super::util::unpack;
 use telcom_parser::lte_rrc::{
     DL_DCCH_MessageType, DL_DCCH_MessageType_c1, RRCConnectionReleaseCriticalExtensions,
     RRCConnectionReleaseCriticalExtensions_c1, RedirectedCarrierInfo,
@@ -23,27 +22,27 @@ impl Analyzer for ConnectionRedirect2GDowngradeAnalyzer {
     }
 
     fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event> {
-        unpack!(InformationElement::LTE(lte_ie) = ie);
-        let message = match &**lte_ie {
-            LteInformationElement::DlDcch(msg_cont) => &msg_cont.message,
-            _ => return None,
-        };
-        unpack!(DL_DCCH_MessageType::C1(c1) = message);
-        unpack!(DL_DCCH_MessageType_c1::RrcConnectionRelease(release) = c1);
-        unpack!(RRCConnectionReleaseCriticalExtensions::C1(c1) = &release.critical_extensions);
-        unpack!(RRCConnectionReleaseCriticalExtensions_c1::RrcConnectionRelease_r8(r8_ies) = c1);
-        unpack!(Some(carrier_info) = &r8_ies.redirected_carrier_info);
-        match carrier_info {
-            RedirectedCarrierInfo::Geran(_carrier_freqs_geran) => Some(Event {
-                event_type: EventType::QualitativeWarning {
-                    severity: Severity::High,
-                },
-                message: "Detected 2G downgrade".to_owned(),
-            }),
-            _ => Some(Event {
-                event_type: EventType::Informational,
-                message: format!("RRCConnectionRelease CarrierInfo: {:?}", carrier_info),
-            }),
+        if let InformationElement::LTE(lte_ie) = ie
+            && let LteInformationElement::DlDcch(msg_cont) = &**lte_ie
+        && let DL_DCCH_MessageType::C1(c1) = &msg_cont.message
+        && let DL_DCCH_MessageType_c1::RrcConnectionRelease(release) = c1
+        && let RRCConnectionReleaseCriticalExtensions::C1(c1) = &release.critical_extensions
+        && let RRCConnectionReleaseCriticalExtensions_c1::RrcConnectionRelease_r8(r8_ies) = c1
+        && let Some(carrier_info) = &r8_ies.redirected_carrier_info {
+            match carrier_info {
+                RedirectedCarrierInfo::Geran(_carrier_freqs_geran) => Some(Event {
+                    event_type: EventType::QualitativeWarning {
+                        severity: Severity::High,
+                    },
+                    message: "Detected 2G downgrade".to_owned(),
+                }),
+                _ => Some(Event {
+                    event_type: EventType::Informational,
+                    message: format!("RRCConnectionRelease CarrierInfo: {:?}", carrier_info),
+                }),
+            }
+        } else {
+            None
         }
     }
 }

lib/src/analysis/mod.rs

@@ -5,4 +5,3 @@ pub mod imsi_requested;
 pub mod information_element;
 pub mod null_cipher;
 pub mod priority_2g_downgrade;
-pub mod util;