src/decoders/trx-ftx/src/common/callsign_hash.rs

@@ -160,8 +160,7 @@ impl CallsignHashTable {
         let mut idx = start_idx;
 
         loop {
-            match &self.entries[idx] {
+            let entry = self.entries[idx].as_ref()?;
-                Some(entry) => {
             let stored = (entry.hash & HASH22_MASK) >> shift;
             if stored == target {
                 return Some(entry.callsign.clone());
@@ -171,9 +170,6 @@ impl CallsignHashTable {
                 return None;
             }
         }
-                None => return None,
-            }
-        }
     }
 
     /// Age all entries and remove those older than `max_age`.

src/decoders/trx-ftx/src/common/text.rs

@@ -64,11 +64,9 @@ pub fn charn(mut c: i32, table: CharTable) -> char {
                 return EXTRAS[c as usize];
             }
         }
-        CharTable::AlphanumSpaceSlash => {
+        CharTable::AlphanumSpaceSlash if c == 0 => {
-            if c == 0 {
             return '/';
         }
-        }
         _ => {}
     }
 
@@ -116,11 +114,9 @@ pub fn nchar(c: char, table: CharTable) -> Option<i32> {
             '?' => return Some(n + 4),
             _ => {}
         },
-        CharTable::AlphanumSpaceSlash => {
+        CharTable::AlphanumSpaceSlash if c == '/' => {
-            if c == '/' {
             return Some(n);
         }
-        }
         _ => {}
     }