bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #81095 - LingMan:unwrap, r=oli-obk

Browse source 
Use Option::unwrap_or instead of open-coding it

r? ```@oli-obk``` Noticed this while we were talking about the other PR just now 😆
```@rustbot``` modify labels +C-cleanup +T-compiler
This commit is contained in:
Mara Bos 2021-01-17 12:24:59 +00:00 • committed by GitHub
commit 7e2425ab73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_codegen_llvm/src/llvm_util.rs
View file

@ -214,11 +214,7 @@ fn handle_native(name: &str) -> &str {
} }
pub fn target_cpu(sess: &Session) -> &str { pub fn target_cpu(sess: &Session) -> &str {
let name = match sess.opts.cg.target_cpu { let name = sess.opts.cg.target_cpu.as_ref().unwrap_or(&sess.target.cpu);
Some(ref s) => &**s,
None => &*sess.target.cpu,
};
handle_native(name) handle_native(name)
} }