Skip to content

Commit 699ec59

Browse files
author
Ariel Ben-Yehuda
authored
Rollup merge of rust-lang#40297 - alexcrichton:fix-submodules, r=brson
Don't put Cargo into the rustc workspace This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to a new `vendor` directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace. Closes rust-lang#40284
2 parents 57a9863 + 7688222 commit 699ec59

File tree

8 files changed

+8
-671
lines changed

8 files changed

+8
-671
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
path = src/doc/nomicon
2323
url = https://github.com/rust-lang-nursery/nomicon
2424
[submodule "src/tools/cargo"]
25-
path = src/tools/cargo
25+
path = cargo
2626
url = https://github.com/rust-lang/cargo
2727
[submodule "reference"]
2828
path = src/doc/reference

cargo

Submodule cargo added at 5f3b9c4

0 commit comments

Comments
 (0)