Improve code readability

gtk-rs · Mar 3, 2019 · 658bdc7 · 658bdc7
1 parent 21191c3
commit 658bdc7
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/analysis/return_value.rs b/src/analysis/return_value.rs
@@ -23,13 +23,13 @@ pub fn analyze(
     used_types: &mut Vec<String>,
     imports: &mut Imports,
 ) -> Info {
-    let typ = match configured_functions.iter()
-                                              .filter_map(|f| f.ret.type_name.as_ref())
-                                              .map(|typ| env.library.find_type(0, typ))
-                                              .next() {
-        Some(Some(typ)) => typ,
-        _ => override_string_type_return(env, func.ret.typ, configured_functions),
-    };
+    let typ = configured_functions.iter()
+                                  .filter_map(|f| f.ret.type_name.as_ref())
+                                  .next()
+                                  .and_then(|typ| env.library.find_type(0, typ))
+                                  .unwrap_or_else(|| override_string_type_return(env,
+                                                                                 func.ret.typ,
+                                                                                 configured_functions));
     let mut parameter = if typ == Default::default() {
         None
     } else {