From 3bd6a927b9a2918627477247ae7339817fb8e504 Mon Sep 17 00:00:00 2001
From: Alain Emilia Anna Zscheile <fogti+devel@ytrizja.de>
Date: Mon, 2 Dec 2024 23:26:05 +0100
Subject: [PATCH] refactor(specctra/mesadata): more idiomatic Option handling

---
 src/specctra/mesadata.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/specctra/mesadata.rs b/src/specctra/mesadata.rs
index 7670958..153d9be 100644
--- a/src/specctra/mesadata.rs
+++ b/src/specctra/mesadata.rs
@@ -119,8 +119,8 @@ impl SpecctraMesadata {
         // workaround for differing syntax
         // collapse multiple rule entries into a single one
         for rule in &pcb.structure.rules {
-            if rule.width.is_some() {
-                structure_rule.width = rule.width.unwrap()
+            if let Some(width) = rule.width {
+                structure_rule.width = width
             }
             structure_rule
                 .clearances
@@ -144,13 +144,10 @@ impl SpecctraMesadata {
     /// it defaults to the general structure rule.
     ///
     pub fn get_rule(&self, net: usize) -> &SpecctraRule {
-        if let Some(netclass) = self.net_netclass.get(&net) {
-            self.class_rules
-                .get(netclass)
-                .unwrap_or(&self.structure_rule)
-        } else {
-            &self.structure_rule
-        }
+        self.net_netclass
+            .get(&net)
+            .and_then(|netclass| self.class_rules.get(netclass))
+            .unwrap_or(&self.structure_rule)
     }
 }