Skip to content

Commit

Permalink
Auto merge of #84103 - calebcartwright:bump-rls-rustfmt, r=Xanewok
Browse files Browse the repository at this point in the history 
update RLS and rustfmt

Fixes #83460 and fixes #83459

cc `@Xanewok`
  • Loading branch information
@bors
bors committed Apr 12, 2021
2 parents 5e73bd1 + e2fe4f2 commit 1284da3
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 46 deletions.
89 changes: 45 additions & 44 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2876,9 +2876,9 @@ dependencies = [

[[package]]
name = "racer"
version = "2.1.44"
version = "2.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7972a124e2b24dce35eb19f81eced829faec0e8227a7d744bbb1089934d05399"
checksum = "15408926f6207643150e0fc2c54a75a689b192df03ac6c59d42ea99c6782c7f7"
dependencies = [
"bitflags",
"clap",
Expand Down Expand Up @@ -3118,6 +3118,7 @@ version = "1.41.0"
dependencies = [
"anyhow",
"cargo",
"cargo-util",
"cargo_metadata 0.8.2",
"clippy_lints",
"crossbeam-channel",
Expand Down Expand Up @@ -3263,18 +3264,19 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_arena"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93575affa286089b92c8208aea4e60fe9fdd251a619a09b566d6e4e2cc123212"
checksum = "259cca0e975ecb05fd289ace45280c30ff792efc04e856a7f18b7fc86a3cb610"
dependencies = [
"rustc-ap-rustc_data_structures",
"smallvec 1.6.1",
]

[[package]]
name = "rustc-ap-rustc_ast"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c700f2d3b25aa8d6446dd2936048737b08b2d547bd86e2a70afa9fee4e9c522"
checksum = "bb9be435d50c88e94bbad6ea468c8680b52c5043bb298ab8058d05251717f8f8"
dependencies = [
"bitflags",
"rustc-ap-rustc_data_structures",
Expand All @@ -3289,9 +3291,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_ast_passes"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e01f63e5259ee397bbe2e395d34a2e6b6b24f10c184d30fbbee1dcd7117f4f3"
checksum = "75246dd1a95a57f7767e53bde3971baa2d948078e180564709f5ea46cf863ddd"
dependencies = [
"itertools 0.9.0",
"rustc-ap-rustc_ast",
Expand All @@ -3308,9 +3310,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_ast_pretty"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d644c69c55deb24257cb0cb5261265fe5134f6f545e9062e1c18b07e422c68"
checksum = "79bede0b44bed453fd0034b7ba492840391f6486bf3e17a1af12922f0b98d4cc"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_span",
Expand All @@ -3319,9 +3321,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_attr"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "797fc68816d5396870f04e03d35164f5275d2502403239d4caec7ce063683f41"
checksum = "84a92a4a34b996694ca2dab70361c60d2d48c07adce57e8155b7ec75e069e3ea"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_ast_pretty",
Expand All @@ -3337,9 +3339,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_data_structures"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d840c4e6198b57982a54543ae604d634c7ceb7107f0c75970b88ebaff077ac5"
checksum = "9cbfa7f82517a1b2efe7106c864c3f930b1da8aff07a27fd317af2f36522fd2e"
dependencies = [
"arrayvec",
"bitflags",
Expand Down Expand Up @@ -3368,9 +3370,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_errors"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f2f99bdc828ad417636d9016611dc9047b641fadcb7f533b8b0e9616d81f90b"
checksum = "58a272a5101843bcb40900cc9ccf80ecfec62830bb1f4a242986da4a34c0da89"
dependencies = [
"annotate-snippets 0.8.0",
"atty",
Expand All @@ -3388,9 +3390,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_expand"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27008b4c7ded287bf5cb20b84d6d5a6566329140f2e2bc8f6e68b37a34898595"
checksum = "3bc7988f3facf2402fe057405ef0f7fbacc7e7a483da25e35a35ac09491fbbfb"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_ast_passes",
Expand All @@ -3412,31 +3414,31 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_feature"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bb47b53670f1263ed1389dda932d5b5a6daf98579c1f076c2ee7d7f22709b7c"
checksum = "5e931cd1580ae60c5737d3fa57633034935e885414e794d83b3e52a81021985c"
dependencies = [
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_span",
]

[[package]]
name = "rustc-ap-rustc_fs_util"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdaddc4bae5ffab17037553e172f5014686db600050429aaa60aec14fe780e84"
checksum = "8fe9422e10d5b441d2a78202667bc85d7cf713a087b9ae6cdea0dfc825d79f07"

[[package]]
name = "rustc-ap-rustc_graphviz"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d73c72543311e88786f7380a3bfd946395579c1a0c0441a879a97fcdea79130"
checksum = "ffffffdef9fd51db69c1d4c045ced8aaab999be5627f2d3a0ce020d74c1f1e50"

[[package]]
name = "rustc-ap-rustc_index"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bba8d74ed4bad44a5b4264cf2a51ad0bd458ed56caa5bb090e989b8002ec6327"
checksum = "7f6f53afc4f7111c82295cb7ea3878f520bbac6a2c5a12e125b4ca9156498cff"
dependencies = [
"arrayvec",
"rustc-ap-rustc_macros",
Expand All @@ -3445,18 +3447,18 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_lexer"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a030d00510966cd31e13dca5e6c1bd40d303a932c54eca40e854188bca8c49e"
checksum = "8056b05346dff7e39164d0434c6ec443a14ab5fbf6221bd1a56e5abbeae5f60c"
dependencies = [
"unicode-xid",
]

[[package]]
name = "rustc-ap-rustc_lint_defs"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdff95da1b5d979183ef5c285817ba6cc67a1ac11296ef1e87b1b5bbaf57213c"
checksum = "364c3fb7b3cbdfe3fbb21d4078ff2cb3c58df63cda27995f8b064d21ee6dede5"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_data_structures",
Expand All @@ -3469,9 +3471,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_macros"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe3ed7401bf6f5a256d58cd0e1c1e2e77eec25e60a0d7ad75313962edcb4e396"
checksum = "4607d6879cae3bae4d0369ca4b3a7510fd6295ac32eec088ac975208ba96ca45"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -3481,9 +3483,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_parse"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "609a624baffa3f99847d57d30c96ee6732ce0912f8df4be239b6fd91533910d6"
checksum = "78d22889bff7ca2346037c9df7ea55c66ffb714f5b50fb62b41975f8ac7a2d70"
dependencies = [
"bitflags",
"rustc-ap-rustc_ast",
Expand All @@ -3501,19 +3503,19 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_serialize"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc232e2a351d8131c8f1386ce372ee22ef7b1b0b897bbf817a8ce4792029a564"
checksum = "d33c710120953c0214f47a6caf42064d7e241003b4af36c98a6d6156e70335f1"
dependencies = [
"indexmap",
"smallvec 1.6.1",
]

[[package]]
name = "rustc-ap-rustc_session"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18acf94c820cd0c64ee1cbd811fd1f4d5ba18987c457c88771359b90cb1a12f5"
checksum = "6d35919041429a90713c8f704fa5209ba159cb554ce74d95722cbc18ac4b4c6f"
dependencies = [
"bitflags",
"getopts",
Expand All @@ -3533,9 +3535,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_span"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3479f453a38b6a5572938d035fc2b3cb6ec379c57f598b8682b512eb90c7858"
checksum = "73b12170c69603c0bf4b50e5c25fd348aae13b8c6465aa0ef4389c9eaa568e51"
dependencies = [
"cfg-if 0.1.10",
"md-5",
Expand All @@ -3553,9 +3555,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_target"
version = "705.0.0"
version = "712.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78cacaf829778cf07bb97a9f4604896789de12392175f3743e74a30ed370f1c1"
checksum = "0a8329d92e7dc24b974f759e6c6e97e2bbc47b18d0573343028f8135ca367200"
dependencies = [
"bitflags",
"rustc-ap-rustc_data_structures",
Expand Down Expand Up @@ -4663,7 +4665,7 @@ dependencies = [

[[package]]
name = "rustfmt-nightly"
version = "1.4.36"
version = "1.4.37"
dependencies = [
"annotate-snippets 0.6.1",
"anyhow",
Expand All @@ -4681,7 +4683,6 @@ dependencies = [
"regex",
"rustc-ap-rustc_ast",
"rustc-ap-rustc_ast_pretty",
"rustc-ap-rustc_attr",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_errors",
"rustc-ap-rustc_expand",
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ object.debug = 0
# vendored copy.
[patch."https://github.com/rust-lang/cargo"]
cargo = { path = "src/tools/cargo" }
cargo-util = { path = "src/tools/cargo/crates/cargo-util" }

[patch."https://github.com/rust-lang/rustfmt"]
# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated 7 files
+107 −75 Cargo.lock
+4 −3 Cargo.toml
+9 −6 rls/src/build/cargo.rs
+1 −1 rls/src/build/cargo_plan.rs
+2 −2 rls/src/build/external.rs
+1 −1 rls/src/build/plan.rs
+11 −2 rls/src/project_model.rs
2 changes: 1 addition & 1 deletion src/tools/rustfmt
Submodule rustfmt updated 30 files
+16 −0 CHANGELOG.md
+98 −64 Cargo.lock
+9 −13 Cargo.toml
+1 −1 rust-toolchain
+1 −1 src/attr.rs
+4 −4 src/bin/main.rs
+0 −2 src/cargo-fmt/main.rs
+16 −1 src/comment.rs
+73 −54 src/expr.rs
+1 −2 src/format-diff/main.rs
+7 −3 src/formatting.rs
+0 −4 src/git-rustfmt/main.rs
+20 −11 src/items.rs
+22 −5 src/lib.rs
+1 −1 src/macros.rs
+9 −12 src/matches.rs
+139 −75 src/modules.rs
+4 −4 src/overflow.rs
+5 −5 src/patterns.rs
+2 −2 src/spanned.rs
+11 −34 src/syntux/parser.rs
+2 −8 src/syntux/session.rs
+3 −4 src/test/mod.rs
+4 −0 src/utils.rs
+2 −2 src/vertical.rs
+15 −16 src/visitor.rs
+31 −0 tests/source/issue-4427.rs
+47 −0 tests/source/issue-4603.rs
+30 −0 tests/target/issue-4427.rs
+47 −0 tests/target/issue-4603.rs

0 comments on commit 1284da3

Please sign in to comment.