Skip to content

Commit

Permalink
Auto merge of rust-lang#41639 - ishitatsuyuki:unify-tools, r=alexcric…
Browse files Browse the repository at this point in the history
…hton

Unify tools building

Close rust-lang#41601

Time saving for up to 10 minutes. Cargo is now only compiled once.

Downsides:

- Out of tree Cargo.lock maintenance
- Cargo.toml `[replace]` version maintenance
  • Loading branch information
bors committed May 18, 2017
2 parents 4640e18 + db69d89 commit 31bfa96
Show file tree
Hide file tree
Showing 8 changed files with 1,168 additions and 209 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading

0 comments on commit 31bfa96

Please sign in to comment.