From ec805d17ebb70c6510914dfab2fb7b7f1c454491 Mon Sep 17 00:00:00 2001
From: Kai Luo <gluokai@gmail.com>
Date: Fri, 19 Jul 2024 13:02:51 +0800
Subject: [PATCH] Revert format change
---
src/tools/compiletest/src/runtest.rs | 30 +++++-----------------------
1 file changed, 5 insertions(+), 25 deletions(-)
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 78f3dcd4fe3..01228869617 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -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(