Skip to content

Commit 6fd4a76

Browse files
Rollup merge of #132261 - ChrisCho-H:refactor/cleaner-check-none, r=compiler-errors
refactor: cleaner check to return None It's very nit change. Refactor to shorten verbose check when returning None for `backend_feature_name`.
2 parents bd43f8e + 82bfe05 commit 6fd4a76

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Diff for: compiler/rustc_codegen_llvm/src/llvm_util.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,9 @@ fn backend_feature_name<'a>(sess: &Session, s: &'a str) -> Option<&'a str> {
698698
let feature = s
699699
.strip_prefix(&['+', '-'][..])
700700
.unwrap_or_else(|| sess.dcx().emit_fatal(InvalidTargetFeaturePrefix { feature: s }));
701-
if s.is_empty() {
702-
return None;
703-
}
704701
// Rustc-specific feature requests like `+crt-static` or `-crt-static`
705702
// are not passed down to LLVM.
706-
if RUSTC_SPECIFIC_FEATURES.contains(&feature) {
703+
if s.is_empty() || RUSTC_SPECIFIC_FEATURES.contains(&feature) {
707704
return None;
708705
}
709706
Some(feature)

0 commit comments

Comments
 (0)