7 files changed, 21 insertions, 22 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index b6f3f97e627..2edc78ebaa9 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -283,13 +283,6 @@ impl Step for Rls {
                                                  SourceType::Submodule,
                                                  &[]);
 
-        // Copy `src/tools/rls/test_data` to a writable drive.
-        let test_workspace_path = builder.out.join("rls-test-data");
-        let test_data_path = test_workspace_path.join("test_data");
-        builder.create_dir(&test_data_path);
-        builder.cp_r(&builder.src.join("src/tools/rls/test_data"), &test_data_path);
-        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());
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 1a5a8740499..7782351a552 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -140,7 +140,7 @@ impl Step for ToolBuild {
         });
 
         if is_expected && !duplicates.is_empty() {
-            println!("duplicate artfacts found when compiling a tool, this \
+            println!("duplicate artifacts found when compiling a tool, this \
                       typically means that something was recompiled because \
                       a transitive dependency has different features activated \
                       than in a previous build:\n");
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 2cf1f5dda2f7ed84e94c4d32f643e0f1f15352f
+Subproject 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb
diff --git a/src/tools/miri b/src/tools/miri
-Subproject bccadeb4f7cbeeb14097a365653148afe8bbd15
+Subproject 2e2a33aab897273a36498d526530f648d6113dc
diff --git a/src/tools/rls b/src/tools/rls
-Subproject bd5b899afb05e14d33e210ede3da241ca1ca088
+Subproject 6f5e4bba7b1586fca6e0ea7724cadb5683b2f30
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index 5acfee28fad..ca440167f9f 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -53,6 +53,7 @@ features = [
 curl-sys = { version = "0.4.13", optional = true }
 parking_lot = { version = "0.6", features = ['nightly'] }
 rand = { version = "0.5.5", features = ["i128_support"] }
+serde = { version = "1.0.82", features = ['derive'] }
 serde_json = { version = "1.0.31", features = ["raw_value"] }
 smallvec = { version = "0.6", features = ['union'] }
 
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index ff7a040ca09..7f0f0c6f79f 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -106,7 +106,9 @@ const WHITELIST: &[Crate] = &[
     Crate("parking_lot_core"),
     Crate("pkg-config"),
     Crate("polonius-engine"),
+    Crate("proc-macro2"),
     Crate("quick-error"),
+    Crate("quote"),
     Crate("rand"),
     Crate("rand_chacha"),
     Crate("rand_core"),
@@ -129,8 +131,10 @@ const WHITELIST: &[Crate] = &[
     Crate("semver"),
     Crate("semver-parser"),
     Crate("serde"),
+    Crate("serde_derive"),
     Crate("smallvec"),
     Crate("stable_deref_trait"),
+    Crate("syn"),
     Crate("tempfile"),
     Crate("termcolor"),
     Crate("terminon"),
@@ -138,6 +142,7 @@ const WHITELIST: &[Crate] = &[
     Crate("thread_local"),
     Crate("ucd-util"),
     Crate("unicode-width"),
+    Crate("unicode-xid"),
     Crate("unreachable"),
     Crate("utf8-ranges"),
     Crate("vcpkg"),