Skip to content

Commit

Permalink
Auto merge of rust-lang#129469 - jieyouxu:exp-msvc-ci, r=<try>
Browse files Browse the repository at this point in the history
[Experimental] what if we use symlink_metadata

r? ghost

Follow up to information revealed in rust-lang#129431.

The cargo branch contains a change:

```diff
diff --git a/crates/cargo-util/src/paths.rs b/crates/cargo-util/src/paths.rs
index 59e812f3aea..d2f023da3ce 100644
--- a/crates/cargo-util/src/paths.rs
+++ b/crates/cargo-util/src/paths.rs
`@@` -571,7 +571,9 `@@` where
 }

 fn set_not_readonly(p: &Path) -> io::Result<bool> {
-    let mut perms = p.metadata()?.permissions();
+    // Note that `p` is possibly a symlink. What if this is
+    // `symlink_metadata`?
+    let mut perms = p.symlink_metadata()?.permissions();
     if !perms.readonly() {
         return Ok(false);
     }
```

try-job: x86_64-msvc-ext
  • Loading branch information
bors committed Aug 23, 2024
2 parents c8b14ba + cc60817 commit 8818871
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
shallow = true
[submodule "src/tools/cargo"]
path = src/tools/cargo
url = https://github.com/rust-lang/cargo.git
url = https://github.com/jieyouxu/cargo.git
branch = exp-msvc-ci-cargo
shallow = true
[submodule "src/doc/reference"]
path = src/doc/reference
Expand Down

0 comments on commit 8818871

Please sign in to comment.