Auto merge of rust-lang#129655 - ChrisDenton:cargo-workaround, r=<try>

Test cargo workaround try-job: x86_64-msvc-ext r? ghost
rust-lang-ci · Sep 2, 2024 · 3e11f65 · 3e11f65
2 parents 9b82580 + dcaa54a
commit 3e11f65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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/ChrisDenton/cargo.git
+	branch = retry
 	shallow = true
 [submodule "src/doc/reference"]
 	path = src/doc/reference

diff --git a/src/tools/cargo b/src/tools/cargo
+2 −2		Cargo.lock
+1 −1		Cargo.toml
+9 −2		crates/cargo-util/Cargo.toml
+3 −0		crates/cargo-util/src/lib.rs
+8 −2		crates/cargo-util/src/paths.rs
+109 −0		crates/cargo-util/src/winpath.rs