about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-02-10 10:00:01 +0000
committerbors <bors@rust-lang.org>2021-02-10 10:00:01 +0000
commit218bf8d7657e1aadf6f499651078f3710df20c7b (patch)
tree434193f4e397c4d17704ecfb98efbcbc80180308 /src/tools
parent6523b721c3d8a92cf06aab04dd15ebe7fd5a9fb7 (diff)
parent0a47a38fd0099f654a1cd38e1de6bbb641863f13 (diff)
Auto merge of #81768 - calebcartwright:bump-rls-rustfmt, r=Xanewok
update RLS and rustfmt

Fixes #81582 and fixes #81583

r? `@Xanewok`

I was originally surprised by the size of lockfile diff, though after looking at the RLS changes it makes a bit more sense to me now
Diffstat (limited to 'src/tools')
m---------src/tools/rls0
m---------src/tools/rustfmt10
-rw-r--r--src/tools/tidy/src/deps.rs1
3 files changed, 5 insertions, 6 deletions
diff --git a/src/tools/rls b/src/tools/rls
-Subproject 88a58d1f484af31d87b75e1d17655b59910f41f
+Subproject 3bd7215d48ba05f18401cc340ae8d71af002ba6
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject ea268b9f559fbafcfc24f4982173b01dfad9e44
+Subproject 7de6968ee22696b7feb6b477a05656de8927529
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 4b521985ca1..f127086724f 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -67,7 +67,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
     "arrayvec",
     "atty",
     "autocfg",
-    "backtrace",
     "bitflags",
     "block-buffer",
     "block-padding",