diff --git a/src/Cargo.lock b/src/Cargo.lock
index 37a6f9130f595..e4d9f6e23945e 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -294,7 +294,6 @@ dependencies = [
 name = "clippy"
 version = "0.0.212"
 dependencies = [
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy-mini-macro-test 0.2.0",
  "clippy_lints 0.0.212",
@@ -303,7 +302,6 @@ dependencies = [
  "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-workspace-hack 1.0.0",
- "rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/tools/clippy b/src/tools/clippy
index 628934424e9c1..d99cea0f16633 160000
--- a/src/tools/clippy
+++ b/src/tools/clippy
@@ -1 +1 @@
-Subproject commit 628934424e9c181a4162b3a5d01e4211ee98b7b7
+Subproject commit d99cea0f16633556871a59500c610782b07233b9
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index 22a22dfcaaa3d..755b172dd1b2c 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -23,6 +23,8 @@ syn = { version = "0.14", features = ['extra-traits'] }
 version = "0.3"
 features = [
   "basetsd",
+  "consoleapi",
+  "errhandlingapi",
   "jobapi",
   "jobapi2",
   "lmcons",
@@ -32,6 +34,7 @@ features = [
   "ntsecapi",
   "ntstatus",
   "profileapi",
+  "processenv",
   "psapi",
   "schannel",
   "securitybaseapi",