Skip to content

Commit 3419da8

Browse files
committed
Auto merge of #81027 - Xanewok:update-rls, r=calebcartwright
Update RLS and Rustfmt Fixes #80576 Updates Rustfmt to use `rustfmt-v1.4.31` branch. Both are updated (along with `racer`) in tandem to pull in the exact same version of rustc-ap-* libraries. r? `@calebcartwright`
2 parents e38fb30 + 3ac464f commit 3419da8

File tree

3 files changed

+49
-49
lines changed

3 files changed

+49
-49
lines changed

Cargo.lock

+47-47
Original file line numberDiff line numberDiff line change
@@ -2720,9 +2720,9 @@ dependencies = [
27202720

27212721
[[package]]
27222722
name = "racer"
2723-
version = "2.1.41"
2723+
version = "2.1.42"
27242724
source = "registry+https://github.com/rust-lang/crates.io-index"
2725-
checksum = "a2f1a4baaaf5c4a9aa30c708c339ae293d02976d2b7f1575a59f44558d25bfea"
2725+
checksum = "d4463624cd50208e86382c13a84561fcd1d3e9d8ff4d97e8ef0c5e304df8d2b9"
27262726
dependencies = [
27272727
"bitflags",
27282728
"clap",
@@ -2964,9 +2964,9 @@ dependencies = [
29642964

29652965
[[package]]
29662966
name = "rls-data"
2967-
version = "0.19.0"
2967+
version = "0.19.1"
29682968
source = "registry+https://github.com/rust-lang/crates.io-index"
2969-
checksum = "76c72ea97e045be5f6290bb157ebdc5ee9f2b093831ff72adfaf59025cf5c491"
2969+
checksum = "a58135eb039f3a3279a33779192f0ee78b56f57ae636e25cec83530e41debb99"
29702970
dependencies = [
29712971
"rls-span",
29722972
"serde",
@@ -3001,9 +3001,9 @@ dependencies = [
30013001

30023002
[[package]]
30033003
name = "rls-span"
3004-
version = "0.5.2"
3004+
version = "0.5.3"
30053005
source = "registry+https://github.com/rust-lang/crates.io-index"
3006-
checksum = "f2e9bed56f6272bd85d9d06d1aaeef80c5fddc78a82199eb36dceb5f94e7d934"
3006+
checksum = "f0eea58478fc06e15f71b03236612173a1b81e9770314edecfa664375e3e4c86"
30073007
dependencies = [
30083008
"serde",
30093009
]
@@ -3049,18 +3049,18 @@ dependencies = [
30493049

30503050
[[package]]
30513051
name = "rustc-ap-rustc_arena"
3052-
version = "691.0.0"
3052+
version = "697.0.0"
30533053
source = "registry+https://github.com/rust-lang/crates.io-index"
3054-
checksum = "81f7b9bc5a6f79b1f230833cb4c8f8928d48c129b21df5b372c202fb826c0b5e"
3054+
checksum = "fb953bea2006184c8f01a6fd3ed51658c73380992a9aefc113e8d32ece6b7516"
30553055
dependencies = [
30563056
"smallvec 1.4.2",
30573057
]
30583058

30593059
[[package]]
30603060
name = "rustc-ap-rustc_ast"
3061-
version = "691.0.0"
3061+
version = "697.0.0"
30623062
source = "registry+https://github.com/rust-lang/crates.io-index"
3063-
checksum = "3d77f313e9f30af93f2737f1a99d6552e26b702c5cef3bb65e35f5b4fe5191f1"
3063+
checksum = "94da60fa49b2f60d2539e8823cf2b4d4e61583ba4ee796b8289e12f017d3dc5b"
30643064
dependencies = [
30653065
"bitflags",
30663066
"rustc-ap-rustc_data_structures",
@@ -3075,9 +3075,9 @@ dependencies = [
30753075

30763076
[[package]]
30773077
name = "rustc-ap-rustc_ast_passes"
3078-
version = "691.0.0"
3078+
version = "697.0.0"
30793079
source = "registry+https://github.com/rust-lang/crates.io-index"
3080-
checksum = "30408fbf42fa6fbeb383d3fce0f24d2490c3d12527beb2f48e6e728765bc8695"
3080+
checksum = "3e9f9eaaee223832187a398abe0f9cb8bc4e5cd538322d8f3864aea65239c79e"
30813081
dependencies = [
30823082
"itertools 0.9.0",
30833083
"rustc-ap-rustc_ast",
@@ -3094,9 +3094,9 @@ dependencies = [
30943094

30953095
[[package]]
30963096
name = "rustc-ap-rustc_ast_pretty"
3097-
version = "691.0.0"
3097+
version = "697.0.0"
30983098
source = "registry+https://github.com/rust-lang/crates.io-index"
3099-
checksum = "d47b8a3adcccc204578b0ee9cd2f9952921fa43977f58343913cca04cce87043"
3099+
checksum = "302b43429c62efc43b159b1f8ab94c8b517fb553cbae854c3fcf34e01c36accb"
31003100
dependencies = [
31013101
"rustc-ap-rustc_ast",
31023102
"rustc-ap-rustc_span",
@@ -3106,9 +3106,9 @@ dependencies = [
31063106

31073107
[[package]]
31083108
name = "rustc-ap-rustc_attr"
3109-
version = "691.0.0"
3109+
version = "697.0.0"
31103110
source = "registry+https://github.com/rust-lang/crates.io-index"
3111-
checksum = "66f5f53ecdbf7d8b47905936f93eb1fdae496137e94b7e4023a0b866b0e1a92d"
3111+
checksum = "2cbd78cb6f7ca0991478d7f1bc5646b6eca58c37ccbdf70b5d83c490a7c47be7"
31123112
dependencies = [
31133113
"rustc-ap-rustc_ast",
31143114
"rustc-ap-rustc_ast_pretty",
@@ -3125,9 +3125,9 @@ dependencies = [
31253125

31263126
[[package]]
31273127
name = "rustc-ap-rustc_data_structures"
3128-
version = "691.0.0"
3128+
version = "697.0.0"
31293129
source = "registry+https://github.com/rust-lang/crates.io-index"
3130-
checksum = "3aa913fa40b90157067b17dd7ddfd5df0d8566e339ffa8351a638bdf3fc7ee81"
3130+
checksum = "7b9ebd359b0f21086a88595a25d92dc7e8e5f7b111e41c52bb6c97e2d95fd0bb"
31313131
dependencies = [
31323132
"arrayvec",
31333133
"bitflags",
@@ -3156,9 +3156,9 @@ dependencies = [
31563156

31573157
[[package]]
31583158
name = "rustc-ap-rustc_errors"
3159-
version = "691.0.0"
3159+
version = "697.0.0"
31603160
source = "registry+https://github.com/rust-lang/crates.io-index"
3161-
checksum = "5d4b4956287d7c4996409b8362aa69c0c9a6853751ff00ee0a6f78223c5ef3ad"
3161+
checksum = "3b810fcac4d738c47d7793afe3e0f2e03d5193c36c698b0fbcebfb64e468c06b"
31623162
dependencies = [
31633163
"annotate-snippets 0.8.0",
31643164
"atty",
@@ -3176,9 +3176,9 @@ dependencies = [
31763176

31773177
[[package]]
31783178
name = "rustc-ap-rustc_expand"
3179-
version = "691.0.0"
3179+
version = "697.0.0"
31803180
source = "registry+https://github.com/rust-lang/crates.io-index"
3181-
checksum = "3fa908bb1b67230dd4309e93edefc6a6c2f3d8b6a195f77c47743c882114a22e"
3181+
checksum = "f5b44aadd09c05a42a21a063e9f2241fd3d9c00c3dd6e474e22c3a3e8274c959"
31823182
dependencies = [
31833183
"rustc-ap-rustc_ast",
31843184
"rustc-ap-rustc_ast_passes",
@@ -3199,31 +3199,31 @@ dependencies = [
31993199

32003200
[[package]]
32013201
name = "rustc-ap-rustc_feature"
3202-
version = "691.0.0"
3202+
version = "697.0.0"
32033203
source = "registry+https://github.com/rust-lang/crates.io-index"
3204-
checksum = "d9b7a1db115893ed7ed0db80f70d2246c1709de7854238acde76471495930f2a"
3204+
checksum = "a2f4121cb9718c8c1c6350a3aaea619fbbae38fb1aadd3d7305586460babb531"
32053205
dependencies = [
32063206
"rustc-ap-rustc_data_structures",
32073207
"rustc-ap-rustc_span",
32083208
]
32093209

32103210
[[package]]
32113211
name = "rustc-ap-rustc_fs_util"
3212-
version = "691.0.0"
3212+
version = "697.0.0"
32133213
source = "registry+https://github.com/rust-lang/crates.io-index"
3214-
checksum = "55937887cb606cc72193ea3c5feb8bbbb810d812aa233b9a1e7749155c4a3501"
3214+
checksum = "fdb0f36e34fafb725795bef3ec6f414cac34e7ca98e6d25927be36d95ae1c6ac"
32153215

32163216
[[package]]
32173217
name = "rustc-ap-rustc_graphviz"
3218-
version = "691.0.0"
3218+
version = "697.0.0"
32193219
source = "registry+https://github.com/rust-lang/crates.io-index"
3220-
checksum = "e39e179e616356927f0c4eda43e3a35d88476f91e1ac8e4a0a09661dbab44a6e"
3220+
checksum = "a98402e20e2913016ed54f12aead5c987fe227a0fb31cc720e17ff51c6f32466"
32213221

32223222
[[package]]
32233223
name = "rustc-ap-rustc_index"
3224-
version = "691.0.0"
3224+
version = "697.0.0"
32253225
source = "registry+https://github.com/rust-lang/crates.io-index"
3226-
checksum = "572d3962d6999f3b1a71d335308e939e204339d4ad36e6ebe7a591c9d4329f5d"
3226+
checksum = "ec91408d727f73f682cd8ae836d762c8dab0ed4e81994ced03aa1edcee3b99a4"
32273227
dependencies = [
32283228
"arrayvec",
32293229
"rustc-ap-rustc_macros",
@@ -3232,18 +3232,18 @@ dependencies = [
32323232

32333233
[[package]]
32343234
name = "rustc-ap-rustc_lexer"
3235-
version = "691.0.0"
3235+
version = "697.0.0"
32363236
source = "registry+https://github.com/rust-lang/crates.io-index"
3237-
checksum = "44bc89d9ca7a78fb82e103b389362c55f03800745f8ba14e068b805cfaf783ec"
3237+
checksum = "67adbe260a0a11910624d6d28c0304fcf7b063e666682111005c83b09f73429d"
32383238
dependencies = [
32393239
"unicode-xid",
32403240
]
32413241

32423242
[[package]]
32433243
name = "rustc-ap-rustc_lint_defs"
3244-
version = "691.0.0"
3244+
version = "697.0.0"
32453245
source = "registry+https://github.com/rust-lang/crates.io-index"
3246-
checksum = "7d39bda92aabd77e49ac8ad5e24fccf9d7245b8ff2bf1249ab98733e2e5a2863"
3246+
checksum = "6bf11d0646da7bd136fbca53834afcc3760fbfc20fa4875e139b3ada41ec53a5"
32473247
dependencies = [
32483248
"rustc-ap-rustc_ast",
32493249
"rustc-ap-rustc_data_structures",
@@ -3255,9 +3255,9 @@ dependencies = [
32553255

32563256
[[package]]
32573257
name = "rustc-ap-rustc_macros"
3258-
version = "691.0.0"
3258+
version = "697.0.0"
32593259
source = "registry+https://github.com/rust-lang/crates.io-index"
3260-
checksum = "a3295fbc9625197494e356e92d8ac08370eddafa60189861c7b2f084b3b5a6b8"
3260+
checksum = "c454b10b66750ffd9bfd7d53b0f30eaba1462356e9ac91f0d037cb0556dc7681"
32613261
dependencies = [
32623262
"proc-macro2",
32633263
"quote",
@@ -3267,9 +3267,9 @@ dependencies = [
32673267

32683268
[[package]]
32693269
name = "rustc-ap-rustc_parse"
3270-
version = "691.0.0"
3270+
version = "697.0.0"
32713271
source = "registry+https://github.com/rust-lang/crates.io-index"
3272-
checksum = "9ff5d0094396844efead43303a6eb25b8a4962e2c80fb0ea4a86e4101fbfd404"
3272+
checksum = "3d03f423948137a8370a88447382a18015d47a273268e3ead2d0a987c3b14070"
32733273
dependencies = [
32743274
"bitflags",
32753275
"rustc-ap-rustc_ast",
@@ -3287,19 +3287,19 @@ dependencies = [
32873287

32883288
[[package]]
32893289
name = "rustc-ap-rustc_serialize"
3290-
version = "691.0.0"
3290+
version = "697.0.0"
32913291
source = "registry+https://github.com/rust-lang/crates.io-index"
3292-
checksum = "2d5cff6709a8b51a3730288a9ead17cabe8146b1c787db52298447ef7890140a"
3292+
checksum = "e7ed5df71bd37d1e179b4bbedf77db76c9e0eb2e03159c58a691adbf29f74682"
32933293
dependencies = [
32943294
"indexmap",
32953295
"smallvec 1.4.2",
32963296
]
32973297

32983298
[[package]]
32993299
name = "rustc-ap-rustc_session"
3300-
version = "691.0.0"
3300+
version = "697.0.0"
33013301
source = "registry+https://github.com/rust-lang/crates.io-index"
3302-
checksum = "36bb15ef12174b5ed6419a7e4260a899ce8927e8c8fd1f0cddf178818737dcdf"
3302+
checksum = "3e3b92b51fad25a897b23ec98961126aea038abeab8d47989f774f7727016b5e"
33033303
dependencies = [
33043304
"bitflags",
33053305
"getopts",
@@ -3319,9 +3319,9 @@ dependencies = [
33193319

33203320
[[package]]
33213321
name = "rustc-ap-rustc_span"
3322-
version = "691.0.0"
3322+
version = "697.0.0"
33233323
source = "registry+https://github.com/rust-lang/crates.io-index"
3324-
checksum = "104d349a32be9cfd3d39a5a70ad6c5e682ce262fc5cc8717d35a01e980c0d8b2"
3324+
checksum = "d98273206d8a571c780f233f3391ea30e29c5e75ecdc60335ccef346046e1953"
33253325
dependencies = [
33263326
"cfg-if 0.1.10",
33273327
"md-5",
@@ -3339,9 +3339,9 @@ dependencies = [
33393339

33403340
[[package]]
33413341
name = "rustc-ap-rustc_target"
3342-
version = "691.0.0"
3342+
version = "697.0.0"
33433343
source = "registry+https://github.com/rust-lang/crates.io-index"
3344-
checksum = "9d7ac4ded9a6aecb534744c836a160497985f0d53b272581e95e7890d31b9e17"
3344+
checksum = "08ce81fe0130e61112db5f3b2db6b21d407e4b14ae467ab9637f4696cc340ad1"
33453345
dependencies = [
33463346
"bitflags",
33473347
"rustc-ap-rustc_data_structures",
@@ -4400,7 +4400,7 @@ dependencies = [
44004400

44014401
[[package]]
44024402
name = "rustfmt-nightly"
4403-
version = "1.4.30"
4403+
version = "1.4.31"
44044404
dependencies = [
44054405
"annotate-snippets 0.6.1",
44064406
"anyhow",

0 commit comments

Comments
 (0)