Cleanup after some refactoring in rustc_target

Urgau · Urgau · commit 6ce5ce82af88 · 2022-04-03T21:29:57.000+02:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -287,8 +287,10 @@ fn handle_native(name: &str) -> &str {
 }
 
 pub fn target_cpu(sess: &Session) -> &str {
-    let name = sess.opts.cg.target_cpu.as_ref().unwrap_or(&sess.target.cpu);
-    handle_native(name)
+    match sess.opts.cg.target_cpu {
+        Some(ref name) => handle_native(name),
+        None => handle_native(sess.target.cpu.as_ref()),
+    }
 }
 
 pub fn target_features(sess: &Session) -> Vec<Symbol> {

Original file line number	Diff line number	Diff line change
`@@ -287,8 +287,10 @@ fn handle_native(name: &str) -> &str {`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`pub fn target_cpu(sess: &Session) -> &str {`
`290`		`- let name = sess.opts.cg.target_cpu.as_ref().unwrap_or(&sess.target.cpu);`
`291`		`- handle_native(name)`
	`290`	`+ match sess.opts.cg.target_cpu {`
	`291`	`+ Some(ref name) => handle_native(name),`
	`292`	`+ None => handle_native(sess.target.cpu.as_ref()),`
	`293`	`+ }`
`292`	`294`	`}`
`293`	`295`
`294`	`296`	`pub fn target_features(sess: &Session) -> Vec<Symbol> {`