diff --git a/Cargo.lock b/Cargo.lock
index 35156084d4e..7c49c89895b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -127,6 +127,27 @@ dependencies = [
  "constant_time_eq",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+dependencies = [
+ "block-padding",
+ "byte-tools",
+ "byteorder",
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+dependencies = [
+ "byte-tools",
+]
+
 [[package]]
 name = "bstr"
 version = "0.2.7"
@@ -136,6 +157,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+
 [[package]]
 name = "bytecount"
 version = "0.6.0"
@@ -301,13 +328,12 @@ dependencies = [
 [[package]]
 name = "clippy_lints"
 version = "0.0.212"
-source = "git+https://github.com/rust-lang/rust-clippy?rev=8b7f7e667268921c278af94ae30a61e87a22b22b#8b7f7e667268921c278af94ae30a61e87a22b22b"
+source = "git+https://github.com/rust-lang/rust-clippy?rev=d236b30a1d638340aad8345fa2946cfe9543dcf0#d236b30a1d638340aad8345fa2946cfe9543dcf0"
 dependencies = [
  "cargo_metadata 0.9.0",
  "if_chain",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
- "matches",
  "pulldown-cmark",
  "quine-mc_cluskey",
  "regex-syntax",
@@ -541,6 +567,15 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 
+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "dirs"
 version = "2.0.2"
@@ -626,6 +661,12 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "fake-simd"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+
 [[package]]
 name = "filetime"
 version = "0.2.7"
@@ -723,6 +764,15 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
+dependencies = [
+ "typenum",
+]
+
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -920,6 +970,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.4"
@@ -1162,6 +1221,17 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
+[[package]]
+name = "md-5"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8"
+dependencies = [
+ "block-buffer",
+ "digest",
+ "opaque-debug",
+]
+
 [[package]]
 name = "measureme"
 version = "0.7.1"
@@ -1291,6 +1361,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+
 [[package]]
 name = "opener"
 version = "0.4.0"
@@ -1494,9 +1570,9 @@ dependencies = [
 
 [[package]]
 name = "racer"
-version = "2.1.32"
+version = "2.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e805a6c323d08b26270f0276cef35608456916dc266ef27434edbe666eceeeb5"
+checksum = "54322b696f7df20e0d79d0244a1088f387b7164a5f17987c4ab984dec1a23e42"
 dependencies = [
  "bitflags",
  "clap",
@@ -1647,7 +1723,7 @@ dependencies = [
  "futures",
  "heck",
  "home",
- "itertools",
+ "itertools 0.8.0",
  "jsonrpc-core",
  "lazy_static",
  "log",
@@ -1689,7 +1765,7 @@ checksum = "534032993e1b60e5db934eab2dde54da7afd1e46c3465fddb2b29eb47cb1ed3a"
 dependencies = [
  "derive-new",
  "fst",
- "itertools",
+ "itertools 0.8.0",
  "json",
  "log",
  "rls-data",
@@ -1769,9 +1845,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-arena"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632704fb93ca8148957191e5d2d827082f93c4aa20cdd242fb46d8cca57029da"
+checksum = "81dfcfbb0ddfd533abf8c076e3b49d1e5042d1962526a12ce2c66d514b24cca3"
 dependencies = [
  "rustc-ap-rustc_data_structures",
  "smallvec 1.2.0",
@@ -1779,15 +1855,15 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-graphviz"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd4689b814859c9f1b3e314ed2bde596acac428a256a16894635f600bed46b4"
+checksum = "7490bb07b014a7f9531bde33c905a805e08095dbefdb4c9988a1b19fe6d019fd"
 
 [[package]]
 name = "rustc-ap-rustc_ast"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "101c1517d3fd19d083aaca5b113f9965e6ae353a0bb09c49959b0f62b95b75d9"
+checksum = "189f16dbb8dd11089274c9ced58b0cae9e1ea3e434a58f3db683817eda849e58"
 dependencies = [
  "log",
  "rustc-ap-rustc_data_structures",
@@ -1802,10 +1878,11 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_ast_passes"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab3f5a7e939b37c99d8ca371f09b10bb5b5c85ad5d5b8d1d736ce8248c71be0"
+checksum = "bbe619609b56a617fa986332b066d53270093c816d8ff8281fc90e1dbe74c1cc"
 dependencies = [
+ "itertools 0.8.0",
  "log",
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_ast_pretty",
@@ -1820,9 +1897,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_ast_pretty"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05046d3a2b8de22b20bcda9a1c063dc5c1f2f721f042b6c2809df2d23c64a13e"
+checksum = "26ab1495f7b420e937688749c1da5763aaabd6ebe8cacb758665a0b8481da094"
 dependencies = [
  "log",
  "rustc-ap-rustc_ast",
@@ -1832,9 +1909,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_attr"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00b7ccad6fc3628fb44950435772945a425575f9ea0b3708c536fe75623a6e8"
+checksum = "2e057495724c60729c1d1d9d49374e0b3ebd6d3481cd161b2871f52fe017b7b5"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_ast_pretty",
@@ -1850,9 +1927,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_data_structures"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6121ab6766644fa76b711f65d4c39f2e335488ab768324567fed0ed191166e"
+checksum = "d2130997667833692f4bec4681d0e73b066d5a01dac1d8a68f22068b82bf173a"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1861,6 +1938,7 @@ dependencies = [
  "indexmap",
  "jobserver",
  "lazy_static",
+ "libc",
  "log",
  "measureme",
  "parking_lot 0.10.0",
@@ -1877,9 +1955,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_errors"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adab84c842003ad1c8435fd71b8d0cc19bf0d702a8a2147d5be06e083db2d207"
+checksum = "908e1ea187c6bb368af4ba6db980001e920515e67371ddc4086e749baabe6080"
 dependencies = [
  "annotate-snippets",
  "atty",
@@ -1895,9 +1973,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_expand"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb001df541ea02b65c8e294252530010c6f90e3c6a5716e8e24e58c12dd1cd86"
+checksum = "50066a75bca872ff933b0ee8a582d18ef1876c8054a392f60c39e538446bfb00"
 dependencies = [
  "log",
  "rustc-ap-rustc_ast",
@@ -1917,9 +1995,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_feature"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446cc60613cc3b05d0bdbcab7feb02305790b5617fa43c532d51ae3223d677a4"
+checksum = "96fb53e1710e6de7c2e371ca56c857b79f9b399aba58aa6b6fbed6e2f677d3f6"
 dependencies = [
  "lazy_static",
  "rustc-ap-rustc_data_structures",
@@ -1928,15 +2006,15 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_fs_util"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac99d6f67e7db3bb300895630e769ed41bd3e336c0e725870c70e676c1a5ff1"
+checksum = "e3f91357e5e468fc2729211571d769723c728a34e200d90a70164e945f881e09"
 
 [[package]]
 name = "rustc-ap-rustc_index"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5608c1cf50d2251b7e10a138cf6dd388e97f139b21c00b06a22d06f89c6591f6"
+checksum = "32220c3e6cdf226f38e4474b747dca15f3106bb680c74f10b299af3f6cdb1663"
 dependencies = [
  "rustc-ap-serialize",
  "smallvec 1.2.0",
@@ -1944,18 +2022,18 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e9c1c6f5dc85977b3adb6fb556b2ff23354d1a12021da15eb1d36353458bde"
+checksum = "3b324d2a2bacad344e53e182e5ca04ffb74745b932849aa074f8f7fec8177da5"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_macros"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3226b5ec864312a5d23eb40a5d621ee06bdc0754228d20d6eb76d4ddc4f2d4a1"
+checksum = "59686c56d5f1b3ed47d0f070c257ed35caf24ecf2d744dd11fe44b1014baee0f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1965,9 +2043,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_parse"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3b042344c2280b50d5df0058d11379028a8f016a407e575bb3ea8b6c798049"
+checksum = "2dfb0c11c591ec5f87bbadb10819795abc9035ff79a26703c1b6c9487ac51f49"
 dependencies = [
  "bitflags",
  "log",
@@ -1985,10 +2063,11 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_session"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff35ef4b5d9fbcb2fd539c7c908eb3cdd1f68ddbccd042945ef50ae65564f941"
+checksum = "3d1a194b1a81d7233ee492847638dc9ebdb7d084300e5ade8dea0ceaa98f95b9"
 dependencies = [
+ "getopts",
  "log",
  "num_cpus",
  "rustc-ap-rustc_ast",
@@ -2004,26 +2083,28 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_span"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e323b1f4a824039886eed8e33cad20ea4f492a9f9b3c9441009797c91de3e87a"
+checksum = "a648146050fed6b58e681ec22488e728f60e16036bb7497c9815e3debd1e4242"
 dependencies = [
  "cfg-if",
  "log",
+ "md-5",
  "rustc-ap-arena",
  "rustc-ap-rustc_data_structures",
  "rustc-ap-rustc_index",
  "rustc-ap-rustc_macros",
  "rustc-ap-serialize",
  "scoped-tls",
+ "sha-1",
  "unicode-width",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_target"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e161eb7b3a5b7993c6b480135296dc61476db80041d49dd446422742426e390b"
+checksum = "28cf28798f0988b808e3616713630e4098d68c6f1f41052a2f7e922e094da744"
 dependencies = [
  "bitflags",
  "log",
@@ -2036,9 +2117,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-serialize"
-version = "651.0.0"
+version = "654.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af510a659098d8c45a7303fb882fa780f4a87ec5f5d7a2053521e7d5d7f332c4"
+checksum = "756e8f526ec7906e132188bf25e3c10a6ee42ab77294ecb3b3602647f0508eef"
 dependencies = [
  "indexmap",
  "smallvec 1.2.0",
@@ -2129,9 +2210,9 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.13"
+version = "1.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381c1d12a076c448c786408da32a18af7b73051eff6fdfc22455d4d29d91d6e3"
+checksum = "746675126d85cb8110a34eeb17a6ae6a2b34f3f8d8d72767c2dc239bb7d24aa9"
 dependencies = [
  "annotate-snippets",
  "bytecount",
@@ -2143,7 +2224,7 @@ dependencies = [
  "failure",
  "getopts",
  "ignore",
- "itertools",
+ "itertools 0.8.0",
  "lazy_static",
  "log",
  "regex",
@@ -2271,6 +2352,18 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "sha-1"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+dependencies = [
+ "block-buffer",
+ "digest",
+ "fake-simd",
+ "opaque-debug",
+]
+
 [[package]]
 name = "shell-escape"
 version = "0.1.4"
diff --git a/Cargo.toml b/Cargo.toml
index 028d43bec7c..7f9fa030465 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
 anyhow = "1.0.26"
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "bda50510d1daf6e9c53ad6ccf603da6e0fa8103f" }
 cargo_metadata = "0.8"
-clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "8b7f7e667268921c278af94ae30a61e87a22b22b", optional = true }
+clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "d236b30a1d638340aad8345fa2946cfe9543dcf0", optional = true }
 env_logger = "0.7"
 futures = { version = "0.1", optional = true }
 home = "0.5.1"
@@ -42,11 +42,11 @@ lsp-types = { version = "0.60", features = ["proposed"] }
 lazy_static = "1"
 log = "0.4"
 num_cpus = "1"
-racer = { version = "2.1.32", default-features = false }
+racer = { version = "2.1.33", default-features = false }
 rand = "0.7"
 rayon = "1"
 rustc_tools_util = "0.2"
-rustfmt-nightly = "1.4.13"
+rustfmt-nightly = "1.4.14"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
diff --git a/rls-rustc/Cargo.toml b/rls-rustc/Cargo.toml
index dc976584ebe..5d078cc1448 100644
--- a/rls-rustc/Cargo.toml
+++ b/rls-rustc/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["development-tools"]
 env_logger = "0.7"
 log = "0.4"
 rand = "0.7"
-clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "8b7f7e667268921c278af94ae30a61e87a22b22b", optional = true }
+clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "d236b30a1d638340aad8345fa2946cfe9543dcf0", optional = true }
 tokio = { version = "0.1", optional = true }
 failure = { version = "0.1" }
 futures = { version = "0.1", optional = true }
diff --git a/rls/src/actions/progress.rs b/rls/src/actions/progress.rs
index 5ceccc23ad1..d7a29a82f41 100644
--- a/rls/src/actions/progress.rs
+++ b/rls/src/actions/progress.rs
@@ -33,7 +33,7 @@ pub trait DiagnosticsNotifier: Send {
 fn new_progress_params(title: String) -> ProgressParams {
     // Counter to generate unique IDs for each chain-of-progress notification.
     lazy_static! {
-        static ref PROGRESS_ID_COUNTER: AtomicUsize = { AtomicUsize::new(0) };
+        static ref PROGRESS_ID_COUNTER: AtomicUsize = AtomicUsize::new(0);
     }
 
     ProgressParams {