Remove the temporary directory when a check ends

Author: dianqk

src/bootstrap/Cargo.toml

@@ -7,7 +7,7 @@ default-run = "bootstrap"
 
 [features]
 build-metrics = ["sysinfo"]
-tracing = ["dep:tracing", "dep:tracing-chrome", "dep:tracing-subscriber", "dep:chrono", "dep:tempfile"]
+tracing = ["dep:tracing", "dep:tracing-chrome", "dep:tracing-subscriber", "dep:chrono"]
 
 [lib]
 path = "src/lib.rs"
@@ -64,7 +64,7 @@ chrono = { version = "0.4", default-features = false, optional = true, features
 tracing = { version = "0.1", optional = true, features = ["attributes"] }
 tracing-chrome = { version = "0.7", optional = true }
 tracing-subscriber = { version = "0.3", optional = true, features = ["env-filter", "fmt", "registry", "std"] }
-tempfile = { version = "3.15.0", optional = true }
+tempfile = { version = "3.15.0" }
 
 [target.'cfg(windows)'.dependencies.junction]
 version = "1.3.0"
@@ -83,7 +83,6 @@ features = [
 
 [dev-dependencies]
 pretty_assertions = "1.4"
-tempfile = "3.15.0"
 insta = "1.43"
 
 # We care a lot about bootstrap's compile times, so don't include debuginfo for

src/bootstrap/src/core/build_steps/test.rs

@@ -10,6 +10,7 @@ use std::path::{Path, PathBuf};
 use std::{env, fs, iter};
 
 use build_helper::exit;
+use tempfile::TempDir;
 
 use crate::core::build_steps::compile::{Std, run_cargo};
 use crate::core::build_steps::doc::{DocumentationFormat, prepare_doc_compiler};
@@ -3224,17 +3225,21 @@ impl Step for Distcheck {
     fn run(self, builder: &Builder<'_>) {
         // Use a temporary directory completely outside the current checkout, to avoid reusing any
         // local source code, built artifacts or configuration by accident
-        let root_dir = std::env::temp_dir().join("distcheck");
+        let root_dir = TempDir::with_prefix("distcheck-").unwrap();
 
-        distcheck_plain_source_tarball(builder, &root_dir.join("distcheck-rustc-src"));
-        distcheck_rust_src(builder, &root_dir.join("distcheck-rust-src"));
-        distcheck_rustc_dev(builder, &root_dir.join("distcheck-rustc-dev"));
+        distcheck_plain_source_tarball(
+            builder,
+            TempDir::with_prefix_in("rustc-src-", &root_dir).unwrap(),
+        );
+        distcheck_rust_src(builder, TempDir::with_prefix_in("rust-src-", &root_dir).unwrap());
+        distcheck_rustc_dev(builder, TempDir::with_prefix_in("rustc-dev-", &root_dir).unwrap());
     }
 }
 
 /// Check that we can build some basic things from the plain source tarball
-fn distcheck_plain_source_tarball(builder: &Builder<'_>, plain_src_dir: &Path) {
+fn distcheck_plain_source_tarball(builder: &Builder<'_>, plain_src_dir: TempDir) {
     builder.info("Distcheck plain source tarball");
+    let plain_src_dir = plain_src_dir.path();
     let plain_src_tarball = builder.ensure(dist::PlainSourceTarball);
     builder.clear_dir(plain_src_dir);
 
@@ -3265,8 +3270,9 @@ fn distcheck_plain_source_tarball(builder: &Builder<'_>, plain_src_dir: &Path) {
 }
 
 /// Check that rust-src has all of libstd's dependencies
-fn distcheck_rust_src(builder: &Builder<'_>, src_dir: &Path) {
+fn distcheck_rust_src(builder: &Builder<'_>, src_dir: TempDir) {
     builder.info("Distcheck rust-src");
+    let src_dir = src_dir.path();
     let src_tarball = builder.ensure(dist::Src);
     builder.clear_dir(src_dir);
 
@@ -3290,8 +3296,9 @@ fn distcheck_rust_src(builder: &Builder<'_>, src_dir: &Path) {
 }
 
 /// Check that rustc-dev's compiler crate source code can be loaded with `cargo metadata`
-fn distcheck_rustc_dev(builder: &Builder<'_>, dir: &Path) {
+fn distcheck_rustc_dev(builder: &Builder<'_>, dir: TempDir) {
     builder.info("Distcheck rustc-dev");
+    let dir = dir.path();
     let tarball = builder.ensure(dist::RustcDev::new(builder, builder.host_target)).unwrap();
     builder.clear_dir(dir);