diff --git a/Cargo.lock b/Cargo.lock
index 4fe24f06886..1d02e973531 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4342,7 +4342,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.28"
+version = "1.4.29"
 dependencies = [
  "annotate-snippets 0.6.1",
  "anyhow",
@@ -5265,7 +5265,7 @@ dependencies = [
  "chrono",
  "lazy_static",
  "matchers",
- "parking_lot 0.11.0",
+ "parking_lot 0.9.0",
  "regex",
  "serde",
  "serde_json",
diff --git a/src/tools/rls b/src/tools/rls
index 9b457351f2d..2cf84baa5e3 160000
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 9b457351f2db8aa436fcf7b46a93e5c2c0e89630
+Subproject commit 2cf84baa5e3c55ac02f42919e67440acb5417125
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index 29f33eb7d67..70ce18255f4 160000
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 29f33eb7d67d729c095a7ac9bce702f6351396ba
+Subproject commit 70ce18255f429caf0d75ecfed8c1464535ee779b