From 5a706cfc49295f67c01fd3d422fa6fa69a018d92 Mon Sep 17 00:00:00 2001 From: LingMan Date: Sat, 16 Jan 2021 20:13:06 +0100 Subject: [PATCH] Use Option::unwrap_or instead of open-coding it --- compiler/rustc_codegen_llvm/src/llvm_util.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 6c2a871e520..722af496422 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -214,11 +214,7 @@ fn handle_native(name: &str) -> &str { } pub fn target_cpu(sess: &Session) -> &str { - let name = match sess.opts.cg.target_cpu { - Some(ref s) => &**s, - None => &*sess.target.cpu, - }; - + let name = sess.opts.cg.target_cpu.as_ref().unwrap_or(&sess.target.cpu); handle_native(name) }