Fix clippy warnings

TeXitoi · Sep 20, 2019 · 0c888e9 · 0c888e9
1 parent 1cae9fa
commit 0c888e9
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/structopt-derive/src/lib.rs b/structopt-derive/src/lib.rs
@@ -290,17 +290,15 @@ fn gen_constructor(fields: &Punctuated<Field, Comma>, parent_attribute: &Attrs)
                     Ty::OptionVec => quote_spanned! { ty.span()=>
                         if matches.is_present(#name) {
                             Some(matches.#values_of(#name)
-                                 .map(|v| v.map(#parse).collect())
-                                 .unwrap_or_else(Vec::new))
+                                 .map_or_else(Vec::new, |v| v.map(#parse).collect()))
                         } else {
                             None
                         }
                     },
 
                     Ty::Vec => quote_spanned! { ty.span()=>
                         matches.#values_of(#name)
-                            .map(|v| v.map(#parse).collect())
-                            .unwrap_or_else(Vec::new)
+                            .map_or_else(Vec::new, |v| v.map(#parse).collect())
                     },
 
                     Ty::Other if occurrences => quote_spanned! { ty.span()=>