about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-03-15 10:58:02 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-03-26 13:07:12 -0700
commitfaebcc108768210cda97a74f0407cd7b3c3348c9 (patch)
treeb328cf4f781391a0d35d1f06c7e719bb0a3235a4 /src/tools
parentab8b961677ac5c74762dcea955aa0ff4d7fe4915 (diff)
downloadrust-faebcc108768210cda97a74f0407cd7b3c3348c9.tar.gz
rust-faebcc108768210cda97a74f0407cd7b3c3348c9.zip
rustbuild: Fail the build if we build Cargo twice
This commit updates the `ToolBuild` step to stream Cargo's JSON messages, parse
them, and record all libraries built. If we build anything twice (aka Cargo)
it'll most likely happen due to dependencies being recompiled which is caught by
this check.
Diffstat (limited to 'src/tools')
m---------src/tools/cargo0
m---------src/tools/rls0
-rw-r--r--src/tools/unstable-book-gen/Cargo.toml4
3 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject d10ec661b06420654bbc4ed0ccd32295698aa1d
+Subproject 311a5eda6f90d660bb23e97c8ee77090519b9ed
diff --git a/src/tools/rls b/src/tools/rls
-Subproject 974c515493f212a21a55b7370c25bcc231f3353
+Subproject f5a0c91a39368395b1c1ad322e04be7b6074bc6
diff --git a/src/tools/unstable-book-gen/Cargo.toml b/src/tools/unstable-book-gen/Cargo.toml
index 4751a5e4151..2839f93f8e2 100644
--- a/src/tools/unstable-book-gen/Cargo.toml
+++ b/src/tools/unstable-book-gen/Cargo.toml
@@ -7,3 +7,7 @@ license = "MIT/Apache-2.0"
 
 [dependencies]
 tidy = { path = "../tidy" }
+
+# not actually needed but required for now to unify the feature selection of
+# `num-traits` between this and `rustbook`
+num-traits = "0.2"