nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-11 19:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert format change

Browse Source
This commit is contained in:
Kai Luo 2024-07-19 13:02:51 +08:00
parent c72df9ddf9
commit ec805d17eb
1 changed files with 5 additions and 25 deletions

30
src/tools/compiletest/src/runtest.rs
View File

@ -280,19 +280,11 @@ impl<'test> TestCx<'test> {
Ui | MirOpt => false,
mode => panic!("unimplemented for mode {:?}", mode),
};
if test_should_run {
self.run_if_enabled()
} else {
WillExecute::No
}
if test_should_run { self.run_if_enabled() } else { WillExecute::No }
}
fn run_if_enabled(&self) -> WillExecute {
if self.config.run_enabled() {
WillExecute::Yes
} else {
WillExecute::Disabled
}
if self.config.run_enabled() { WillExecute::Yes } else { WillExecute::Disabled }
}
fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
@ -2451,11 +2443,7 @@ impl<'test> TestCx<'test> {
/// The revision, ignored for incremental compilation since it wants all revisions in
/// the same directory.
fn safe_revision(&self) -> Option<&str> {
if self.config.mode == Incremental {
None
} else {
self.revision
}
if self.config.mode == Incremental { None } else { self.revision }
}
/// Gets the absolute path to the directory where all output for the given
@ -2679,11 +2667,7 @@ impl<'test> TestCx<'test> {
fn charset() -> &'static str {
// FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
if cfg!(target_os = "freebsd") {
"ISO-8859-1"
} else {
"UTF-8"
}
if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
}
fn run_rustdoc_test(&self) {
@ -4506,11 +4490,7 @@ impl<'test> TestCx<'test> {
for output_file in files {
println!("Actual {} saved to {}", kind, output_file.display());
}
if self.config.bless {
0
} else {
1
}
if self.config.bless { 0 } else { 1 }
}
fn check_and_prune_duplicate_outputs(