mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132261 - ChrisCho-H:refactor/cleaner-check-none, r=compiler-errors

Browse Source 
refactor: cleaner check to return None

It's very nit change. Refactor to shorten verbose check when returning None for `backend_feature_name`.
This commit is contained in:
Jubilee 2024-10-28 10:18:52 -07:00 committed by GitHub
commit 6fd4a76d3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_codegen_llvm/src/llvm_util.rs
View File

@ -698,12 +698,9 @@ fn backend_feature_name<'a>(sess: &Session, s: &'a str) -> Option<&'a str> {
let feature = s let feature = s
.strip_prefix(&['+', '-'][..]) .strip_prefix(&['+', '-'][..])
.unwrap_or_else(|| sess.dcx().emit_fatal(InvalidTargetFeaturePrefix { feature: s })); .unwrap_or_else(|| sess.dcx().emit_fatal(InvalidTargetFeaturePrefix { feature: s }));
if s.is_empty() {
return None;
}
// Rustc-specific feature requests like `+crt-static` or `-crt-static` // Rustc-specific feature requests like `+crt-static` or `-crt-static`
// are not passed down to LLVM. // are not passed down to LLVM.
if RUSTC_SPECIFIC_FEATURES.contains(&feature) { if s.is_empty() || RUSTC_SPECIFIC_FEATURES.contains(&feature) {
return None; return None;
} }
Some(feature) Some(feature)