Unify all stage2 tools into a workspace

This avoids double compiled Cargo. Hopefully this would speed up (extended) compilation for ~10m.

Notes: when updating Cargo submodule, the replacement version may also need to be updated.
This commit is contained in:
Tatsuyuki Ishi 2017-04-30 08:11:58 +09:00
parent 208d23a996
commit 0e79b9790a
4 changed files with 1055 additions and 79 deletions

4
.gitmodules vendored
View File

@ -23,7 +23,7 @@
url = https://github.com/rust-lang-nursery/nomicon.git
[submodule "src/tools/cargo"]
path = src/tools/cargo
url = https://github.com/rust-lang/cargo
url = https://github.com/rust-lang/cargo.git
[submodule "reference"]
path = src/doc/reference
url = https://github.com/rust-lang-nursery/reference.git
@ -32,4 +32,4 @@
url = https://github.com/rust-lang/book.git
[submodule "src/tools/rls"]
path = src/tools/rls
url = https://github.com/rust-lang-nursery/rls
url = https://github.com/rust-lang-nursery/rls.git

1121
src/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -14,10 +14,6 @@ members = [
"tools/remote-test-client",
"tools/remote-test-server",
"tools/rust-installer",
]
# These projects have their own Cargo.lock
exclude = [
"tools/cargo",
"tools/rls",
]
@ -38,3 +34,6 @@ debug-assertions = false
[profile.test]
debug = false
debug-assertions = false
[replace]
"https://github.com/rust-lang/cargo#0.20.0" = { path = "tools/cargo" }

@ -1 +1 @@
Subproject commit 6a2c5d129101762d204185b888d62a244011c422
Subproject commit daa2a05ebe7b8d07a309e8891ebc548652362954