Skip to content

Commit b0623c0

Browse files
committed
Include Path in tested types
1 parent 65b95be commit b0623c0

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,19 @@ impl<'test> TestCx<'test> {
272272
Ui | MirOpt => false,
273273
mode => panic!("unimplemented for mode {:?}", mode),
274274
};
275-
if test_should_run { self.run_if_enabled() } else { WillExecute::No }
275+
if test_should_run {
276+
self.run_if_enabled()
277+
} else {
278+
WillExecute::No
279+
}
276280
}
277281

278282
fn run_if_enabled(&self) -> WillExecute {
279-
if self.config.run_enabled() { WillExecute::Yes } else { WillExecute::Disabled }
283+
if self.config.run_enabled() {
284+
WillExecute::Yes
285+
} else {
286+
WillExecute::Disabled
287+
}
280288
}
281289

282290
fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
@@ -2685,7 +2693,11 @@ impl<'test> TestCx<'test> {
26852693
/// The revision, ignored for incremental compilation since it wants all revisions in
26862694
/// the same directory.
26872695
fn safe_revision(&self) -> Option<&str> {
2688-
if self.config.mode == Incremental { None } else { self.revision }
2696+
if self.config.mode == Incremental {
2697+
None
2698+
} else {
2699+
self.revision
2700+
}
26892701
}
26902702

26912703
/// Gets the absolute path to the directory where all output for the given
@@ -2908,7 +2920,11 @@ impl<'test> TestCx<'test> {
29082920

29092921
fn charset() -> &'static str {
29102922
// FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
2911-
if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
2923+
if cfg!(target_os = "freebsd") {
2924+
"ISO-8859-1"
2925+
} else {
2926+
"UTF-8"
2927+
}
29122928
}
29132929

29142930
fn run_rustdoc_test(&self) {
@@ -4699,7 +4715,11 @@ impl<'test> TestCx<'test> {
46994715
for output_file in files {
47004716
println!("Actual {} saved to {}", kind, output_file.display());
47014717
}
4702-
if self.config.bless { 0 } else { 1 }
4718+
if self.config.bless {
4719+
0
4720+
} else {
4721+
1
4722+
}
47034723
}
47044724

47054725
fn check_and_prune_duplicate_outputs(

0 commit comments

Comments
 (0)