Rollup merge of rust-lang#80464 - LingMan:map_or, r=oli-obk

Use Option::map_or instead of open coding it `@rustbot` modify labels +C-cleanup +T-compiler
GuillaumeGomez · Dec 29, 2020 · ba03726 · ba03726
2 parents 8dfde9d + 3dae414
commit ba03726
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/compiler/rustc_ast_passes/src/feature_gate.rs b/compiler/rustc_ast_passes/src/feature_gate.rs
@@ -397,10 +397,8 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
         match i.kind {
             ast::ForeignItemKind::Fn(..) | ast::ForeignItemKind::Static(..) => {
                 let link_name = self.sess.first_attr_value_str_by_name(&i.attrs, sym::link_name);
-                let links_to_llvm = match link_name {
-                    Some(val) => val.as_str().starts_with("llvm."),
-                    _ => false,
-                };
+                let links_to_llvm =
+                    link_name.map_or(false, |val| val.as_str().starts_with("llvm."));
                 if links_to_llvm {
                     gate_feature_post!(
                         &self,