From 57863c2d709e85b86f95b959647b98ae8aab0c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 30 Apr 2021 10:59:15 +0200
Subject: [PATCH] ir: Use early return in c_naming_prefix.

---
 src/ir/item.rs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/ir/item.rs b/src/ir/item.rs
index 9375c79871..4e0ba80b42 100644
--- a/src/ir/item.rs
+++ b/src/ir/item.rs
@@ -1063,18 +1063,19 @@ impl Item {
 
     /// Returns a prefix for the canonical name when C naming is enabled.
     fn c_naming_prefix(&self) -> Option<&str> {
-        if let ItemKind::Type(typ) = &self.kind {
-            match typ.kind() {
-                TypeKind::Comp(comp_info) => match comp_info.kind() {
-                    CompKind::Struct => Some("struct"),
-                    CompKind::Union => Some("union"),
-                },
-                TypeKind::Enum(_) => Some("enum"),
-                _ => None,
-            }
-        } else {
-            None
-        }
+        let ty = match self.kind {
+            ItemKind::Type(ref ty) => ty,
+            _ => return None,
+        };
+
+        Some(match ty.kind() {
+            TypeKind::Comp(ref ci) => match ci.kind() {
+                CompKind::Struct => "struct",
+                CompKind::Union => "union",
+            },
+            TypeKind::Enum(..) => "enum",
+            _ => return None,
+        })
     }
 }