From ced4090be51b31a6015d721ee1fdc617397006f0 Mon Sep 17 00:00:00 2001 From: Cooper Quintin Date: Fri, 1 May 2026 13:43:26 -0700 Subject: [PATCH] appease clippy --- lib/src/analysis/imsi_requested.rs | 38 ++++++++++-------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/lib/src/analysis/imsi_requested.rs b/lib/src/analysis/imsi_requested.rs index 5ab99a5..038eff7 100644 --- a/lib/src/analysis/imsi_requested.rs +++ b/lib/src/analysis/imsi_requested.rs @@ -85,9 +85,7 @@ impl ImsiRequestedAnalyzer { if self.likely_enb_plmn == self.likely_ue_plmn { self.flag = Some(Event { event_type: EventType::High, - message: format!( - "Disconnected after Identity Request without Auth Accept on home network!" - ), + message: "Disconnected after Identity Request without Auth Accept on home network!".to_string(), }); } else { self.flag = Some(Event { @@ -128,34 +126,22 @@ impl ImsiRequestedAnalyzer { // PLMN is represented in two very different ways in the LTE spec so we need // two very different functions to decode them. I hate this. fn plmn_identity_to_str(&mut self, plmn: &PLMN_Identity) -> String { - let mcc_digits: String = plmn - .mcc + let mcc_digits: String = plmn.mcc .as_ref() - .map(|mcc| { - mcc.0 - .iter() - .filter_map(|d| match d { - MCC_MNC_Digit(n) => Some(n.to_string()), - }) - .collect::>() - .join("") - }) + .map(|mcc| mcc.0.iter() + .map(|MCC_MNC_Digit(n)| n.to_string()) + .collect::()) .unwrap_or_default(); - - let mnc_digits: String = plmn - .mnc - .0 - .iter() - .filter_map(|d| match d { - MCC_MNC_Digit(n) => Some(n.to_string()), - }) - .collect::>() - .join(""); - + + let mnc_digits: String = plmn.mnc + .0.iter() + .map(|MCC_MNC_Digit(n)| n.to_string()) + .collect::(); + format!("{}-{}", mcc_digits, mnc_digits) } - fn plmn_vec_to_str(&mut self, bytes: &Vec) -> String { + fn plmn_vec_to_str(&mut self, bytes: &[u8]) -> String { let mcc_digit1 = bytes[0] & 0x0F; let mcc_digit2 = (bytes[0] >> 4) & 0x0F; let mcc_digit3 = bytes[1] & 0x0F;