Code cleanup: remove some unwrap() calls

enumscribe_derive/src/attribute.rs

@@ -165,14 +165,14 @@ impl Dict {
     }
 
     pub(crate) fn assert_empty(&self) -> MacroResult<()> {
-        if self.inner.is_empty() {
+        match self.inner.iter().next() {
-            Ok(())
+            Some((unexpected_key, (_, unexpected_span))) => {
-        } else {
-            let (unexpected_key, (_, unexpected_span)) = self.inner.iter().next().unwrap();
                 Err(MacroError::new(
                     format!("unexpected key: {}", unexpected_key),
                     *unexpected_span,
                 ))
+            },
+            None => Ok(()),
         }
     }
 }

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())
+        .filter_map(|name| name)
-        .map(|name| name.unwrap())
         .collect::<Vec<_>>();
 
     let main_match = proc_try!(gen_unscribe_match(