nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Use Option::map_or instead of open coding it

``@rustbot`` modify labels +C-cleanup +T-compiler
This commit is contained in:
Yuki Okushi 2020-12-30 18:15:16 +09:00 committed by GitHub
commit 30ddc91d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_ast_passes/src/feature_gate.rs
View File

@ -397,10 +397,8 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
match i.kind { match i.kind {
ast::ForeignItemKind::Fn(..) | ast::ForeignItemKind::Static(..) => { ast::ForeignItemKind::Fn(..) | ast::ForeignItemKind::Static(..) => {
let link_name = self.sess.first_attr_value_str_by_name(&i.attrs, sym::link_name); let link_name = self.sess.first_attr_value_str_by_name(&i.attrs, sym::link_name);
let links_to_llvm = match link_name { let links_to_llvm =
Some(val) => val.as_str().starts_with("llvm."), link_name.map_or(false, |val| val.as_str().starts_with("llvm."));
_ => false,
};
if links_to_llvm { if links_to_llvm {
gate_feature_post!( gate_feature_post!(
&self, &self,