From 69741facf5bf786c6003e25442cac90b68b9856d Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 4 Sep 2024 19:59:59 -0700
Subject: [PATCH] testing: Small cleanup

---
 src/testing.rs | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/testing.rs b/src/testing.rs
index 2f6baf5..f48f0a1 100644
--- a/src/testing.rs
+++ b/src/testing.rs
@@ -256,22 +256,16 @@ impl<'a> InterfaceIntrospection<'a> {
         let mut issues = 0;
 
         for key in local_method_names.union(&other_method_names) {
-            let local_method = match local_methods.get(*key) {
-                None => {
-                    error!("Method {key} missing on self");
-                    issues += 1;
-                    continue;
-                }
-                Some(method) => method,
+            let Some(local_method) = local_methods.get(*key) else {
+                error!("Method {key} missing on self");
+                issues += 1;
+                continue;
             };
 
-            let other_method = match other_methods.get(*key) {
-                None => {
-                    error!("Method {key} missing on other");
-                    issues += 1;
-                    continue;
-                }
-                Some(method) => method,
+            let Some(other_method) = other_methods.get(*key) else {
+                error!("Method {key} missing on other");
+                issues += 1;
+                continue;
             };
 
             if local_method.args().len() != other_method.args().len() {
@@ -309,22 +303,16 @@ impl<'a> InterfaceIntrospection<'a> {
         let mut issues = 0;
 
         for key in local_property_names.union(&other_property_names) {
-            let local_property = match local_properties.get(*key) {
-                None => {
-                    error!("Property {key} missing on self");
-                    issues += 1;
-                    continue;
-                }
-                Some(prop) => prop,
+            let Some(local_property) = local_properties.get(*key) else {
+                error!("Property {key} missing on self");
+                issues += 1;
+                continue;
             };
 
-            let other_property = match other_properties.get(*key) {
-                None => {
-                    error!("Property {key} missing on other");
-                    issues += 1;
-                    continue;
-                }
-                Some(prop) => prop,
+            let Some(other_property) = other_properties.get(*key) else {
+                error!("Property {key} missing on other");
+                issues += 1;
+                continue;
             };
 
             if local_property.ty() != other_property.ty() {