about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-07-31 14:16:55 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-08-02 18:09:19 -0700
commit0e034d162a5b61a47a251d8b0f1fe82dc6d434d5 (patch)
tree8e707049f38bf2e50ccd9b56302b6fdbcf5431d8 /src/bootstrap
parent40e4b6ee3dd70a05007915bd1c15c150a7b7899f (diff)
downloadrust-0e034d162a5b61a47a251d8b0f1fe82dc6d434d5.tar.gz
rust-0e034d162a5b61a47a251d8b0f1fe82dc6d434d5.zip
Update Cargo submodule
Bring in some fixes for `cargo fix` notably
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs2
-rw-r--r--src/bootstrap/tool.rs4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 24a1dbbde66..c86010379f4 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -298,6 +298,8 @@ impl Step for Rls {
         cargo.env("RLS_TEST_WORKSPACE_DIR", test_workspace_path);
 
         builder.add_rustc_lib_path(compiler, &mut cargo);
+        cargo.arg("--")
+            .args(builder.config.cmd.test_args());
 
         if try_run(builder, &mut cargo) {
             builder.save_toolstate("rls", ToolState::TestPass);
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 5e68b797b3d..eaa31649447 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -221,6 +221,10 @@ impl Step for ToolBuild {
                          prev.0, &prev_features - &cur_features, prev.1);
             }
             println!("");
+            println!("to fix this you will probably want to edit the local \
+                      src/tools/rustc-workspace-hack/Cargo.toml crate, as \
+                      that will update the dependency graph to ensure that \
+                      these crates all share the same feature set");
             panic!("tools should not compile multiple copies of the same crate");
         }