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
This commit is contained in:
bors 2021-02-10 10:00:01 +00:00
commit 218bf8d765
5 changed files with 252 additions and 422 deletions

File diff suppressed because it is too large Load diff

View file

@ -106,11 +106,5 @@ rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
# This crate's integration with libstd is a bit wonky, so we use a submodule
# instead of a crates.io dependency. Make sure everything else in the repo is
# also using the submodule, however, so we can avoid duplicate copies of the
# source code for this crate.
backtrace = { path = "library/backtrace" }
[patch."https://github.com/rust-lang/rust-clippy"]
clippy_lints = { path = "src/tools/clippy/clippy_lints" }

@ -1 +1 @@
Subproject commit 88a58d1f484af31d87b75e1d17655b59910f41fe
Subproject commit 3bd7215d48ba05f18401cc340ae8d71af002ba6d

@ -1 +1 @@
Subproject commit ea268b9f559fbafcfc24f4982173b01dfad9e443
Subproject commit 7de6968ee22696b7feb6b477a05656de89275291

View file

@ -67,7 +67,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
"arrayvec",
"atty",
"autocfg",
"backtrace",
"bitflags",
"block-buffer",
"block-padding",