Unrolled build for rust-lang#116349

rust-timer · web-flow · commit af0b630e4db5 · 2023-10-02T18:01:28.000-04:00
Rollup merge of rust-lang#116349 - onur-ozkan:hfix, r=tmandry ensure the parent path's existence on `x install` fixes rust-lang#116127 (comment) cc `@tmandry`
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
@@ -46,10 +46,10 @@ fn sanitize_sh(path: &Path) -> String {
 }
 
 fn is_dir_writable_for_user(dir: &PathBuf) -> bool {
-    let tmp_file = dir.join(".tmp");
-    match fs::File::create(&tmp_file) {
+    let tmp = dir.join(".tmp");
+    match fs::create_dir_all(&tmp) {
         Ok(_) => {
-            fs::remove_file(tmp_file).unwrap();
+            fs::remove_dir_all(tmp).unwrap();
             true
         }
         Err(e) => {

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,10 @@ fn sanitize_sh(path: &Path) -> String {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`fn is_dir_writable_for_user(dir: &PathBuf) -> bool {`
`49`		`- let tmp_file = dir.join(".tmp");`
`50`		`- match fs::File::create(&tmp_file) {`
	`49`	`+ let tmp = dir.join(".tmp");`
	`50`	`+ match fs::create_dir_all(&tmp) {`
`51`	`51`	`Ok(_) => {`
`52`		`- fs::remove_file(tmp_file).unwrap();`
	`52`	`+ fs::remove_dir_all(tmp).unwrap();`
`53`	`53`	`true`
`54`	`54`	`}`
`55`	`55`	`Err(e) => {`