Rollup merge of rust-lang#135094 - joshtriplett:bootstrap-show-nonexistent-dir, r=jieyouxu

workingjubilee · web-flow · commit e2983d843ce3 · 2025-01-04T07:57:36.000-08:00
bootstrap: If dir_is_empty fails, show the non-existent directory path

This should help when trying to debug issues.
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
@@ -438,7 +438,7 @@ fn lld_flag_no_threads(builder: &Builder<'_>, lld_mode: LldMode, is_windows: boo
 }
 
 pub fn dir_is_empty(dir: &Path) -> bool {
-    t!(std::fs::read_dir(dir)).next().is_none()
+    t!(std::fs::read_dir(dir), dir).next().is_none()
 }
 
 /// Extract the beta revision from the full version string.

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ fn lld_flag_no_threads(builder: &Builder<'_>, lld_mode: LldMode, is_windows: boo`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`pub fn dir_is_empty(dir: &Path) -> bool {`
`441`		`- t!(std::fs::read_dir(dir)).next().is_none()`
	`441`	`+ t!(std::fs::read_dir(dir), dir).next().is_none()`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`/// Extract the beta revision from the full version string.`