OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #69653 - matthiaskrgr:needless_bool, r=Dylan-DPC

Browse Source 
use conditions directly
This commit is contained in:
Dylan DPC 2020-03-03 21:26:15 +01:00 committed by GitHub
commit 099cd7f402
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc_codegen_llvm/va_arg.rs
View File

@ -117,8 +117,7 @@ pub(super) fn emit_va_arg(
// Windows x86_64 // Windows x86_64
("x86_64", true) => { ("x86_64", true) => {
let target_ty_size = bx.cx.size_of(target_ty).bytes(); let target_ty_size = bx.cx.size_of(target_ty).bytes();
let indirect = let indirect: bool = target_ty_size > 8 || !target_ty_size.is_power_of_two();
if target_ty_size > 8 || !target_ty_size.is_power_of_two() { true } else { false };
emit_ptr_va_arg(bx, addr, target_ty, indirect, Align::from_bytes(8).unwrap(), false) emit_ptr_va_arg(bx, addr, target_ty, indirect, Align::from_bytes(8).unwrap(), false)
} }
// For all other architecture/OS combinations fall back to using // For all other architecture/OS combinations fall back to using

2
src/librustc_span/source_map.rs
View File

@ -689,7 +689,7 @@ impl SourceMap {
whitespace_found = true; whitespace_found = true;
} }
if whitespace_found && !c.is_whitespace() { false } else { true } !whitespace_found || c.is_whitespace()
}) })
} }