From 0880156d37b7774e6541d94442af6a1d8a528c3e Mon Sep 17 00:00:00 2001
From: Pantonshire <tom@tomandtally.co.uk>
Date: Mon, 24 May 2021 19:54:24 +0100
Subject: [PATCH] Code cleanup: remove some unwrap() calls

---
 enumscribe_derive/src/attribute.rs | 16 ++++++++--------
 enumscribe_derive/src/lib.rs       |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/enumscribe_derive/src/attribute.rs b/enumscribe_derive/src/attribute.rs
index 676e684..dbe263c 100644
--- a/enumscribe_derive/src/attribute.rs
+++ b/enumscribe_derive/src/attribute.rs
@@ -165,14 +165,14 @@ impl Dict {
     }
 
     pub(crate) fn assert_empty(&self) -> MacroResult<()> {
-        if self.inner.is_empty() {
-            Ok(())
-        } else {
-            let (unexpected_key, (_, unexpected_span)) = self.inner.iter().next().unwrap();
-            Err(MacroError::new(
-                format!("unexpected key: {}", unexpected_key),
-                *unexpected_span,
-            ))
+        match self.inner.iter().next() {
+            Some((unexpected_key, (_, unexpected_span))) => {
+                Err(MacroError::new(
+                    format!("unexpected key: {}", unexpected_key),
+                    *unexpected_span,
+                ))
+            },
+            None => Ok(()),
         }
     }
 }
diff --git a/enumscribe_derive/src/lib.rs b/enumscribe_derive/src/lib.rs
index b747945..aaca8f7 100644
--- a/enumscribe_derive/src/lib.rs
+++ b/enumscribe_derive/src/lib.rs
@@ -749,8 +749,7 @@ pub fn derive_enum_deserialize(input: TokenStream) -> TokenStream {
             VariantType::Named { name, .. } => Some(name.as_str()),
             _ => None,
         })
-        .filter(|name| name.is_some())
-        .map(|name| name.unwrap())
+        .filter_map(|name| name)
         .collect::<Vec<_>>();
 
     let main_match = proc_try!(gen_unscribe_match(