From 75ed08972703798888fceff12b3217408ca6a4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?=
<39484203+jieyouxu@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:24:56 +0800
Subject: [PATCH] compiletest: use `std::fs::remove_dir_all` now that it is
available
---
src/tools/compiletest/src/runtest.rs | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index eca21e559896a..6d45040345ad4 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -3265,7 +3265,7 @@ impl<'test> TestCx<'test> {
let tmpdir = cwd.join(self.output_base_name());
if tmpdir.exists() {
- self.aggressive_rm_rf(&tmpdir).unwrap();
+ fs::remove_dir_all(&tmpdir).unwrap();
}
create_dir_all(&tmpdir).unwrap();
@@ -3404,29 +3404,6 @@ impl<'test> TestCx<'test> {
}
}
- fn aggressive_rm_rf(&self, path: &Path) -> io::Result<()> {
- for e in path.read_dir()? {
- let entry = e?;
- let path = entry.path();
- if entry.file_type()?.is_dir() {
- self.aggressive_rm_rf(&path)?;
- } else {
- // Remove readonly files as well on windows (by default we can't)
- fs::remove_file(&path).or_else(|e| {
- if cfg!(windows) && e.kind() == io::ErrorKind::PermissionDenied {
- let mut meta = entry.metadata()?.permissions();
- meta.set_readonly(false);
- fs::set_permissions(&path, meta)?;
- fs::remove_file(&path)
- } else {
- Err(e)
- }
- })?;
- }
- }
- fs::remove_dir(path)
- }
-
fn run_rmake_v2_test(&self) {
// For `run-make` V2, we need to perform 2 steps to build and run a `run-make` V2 recipe
// (`rmake.rs`) to run the actual tests. The support library is already built as a tool rust
@@ -3475,7 +3452,7 @@ impl<'test> TestCx<'test> {
// This setup intentionally diverges from legacy Makefile run-make tests.
let base_dir = self.output_base_name();
if base_dir.exists() {
- self.aggressive_rm_rf(&base_dir).unwrap();
+ fs::remove_dir_all(&base_dir).unwrap();
}
let rmake_out_dir = base_dir.join("rmake_out");
create_dir_all(&rmake_out_dir).unwrap();