Skip to content

Commit 1721c96

Browse files
committed
Auto merge of #65328 - lzutao:bump-rls-rustfmt, r=Xanewok
Update rls and rustfmt cc @Xanewok Fixes #65084 Fixes #65085 Suppressed #65311
2 parents 152527f + 81d813d commit 1721c96

File tree

3 files changed

+42
-29
lines changed

3 files changed

+42
-29
lines changed

Cargo.lock

+40-27
Original file line numberDiff line numberDiff line change
@@ -1330,9 +1330,9 @@ checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
13301330

13311331
[[package]]
13321332
name = "home"
1333-
version = "0.5.0"
1333+
version = "0.5.1"
13341334
source = "registry+https://github.com/rust-lang/crates.io-index"
1335-
checksum = "c07c315e106bd6f83f026a20ddaeef2706782e490db1dcdd37caad38a0e895b3"
1335+
checksum = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8"
13361336
dependencies = [
13371337
"scopeguard 1.0.0",
13381338
"winapi 0.3.6",
@@ -2657,9 +2657,9 @@ dependencies = [
26572657

26582658
[[package]]
26592659
name = "racer"
2660-
version = "2.1.27"
2660+
version = "2.1.28"
26612661
source = "registry+https://github.com/rust-lang/crates.io-index"
2662-
checksum = "dde22b84ab75220015cbd91240222402bf885cbe3a5dc856475771abb82533ae"
2662+
checksum = "acc70369054bad4ad0c16a3f45cd73e0695361a3af35c7b465e619ac2674f064"
26632663
dependencies = [
26642664
"bitflags",
26652665
"clap",
@@ -3117,25 +3117,25 @@ dependencies = [
31173117

31183118
[[package]]
31193119
name = "rustc-ap-arena"
3120-
version = "583.0.0"
3120+
version = "606.0.0"
31213121
source = "registry+https://github.com/rust-lang/crates.io-index"
3122-
checksum = "f59b76d334bd533f3fdc5c651c27678c5e80fac67c6f7da22ba21a58878c55f5"
3122+
checksum = "a623fd4805842e9bd0bb6e6dace63efede0ee22de4522a0b03b7c3d15a22f009"
31233123
dependencies = [
31243124
"rustc-ap-rustc_data_structures",
31253125
"smallvec",
31263126
]
31273127

31283128
[[package]]
31293129
name = "rustc-ap-graphviz"
3130-
version = "583.0.0"
3130+
version = "606.0.0"
31313131
source = "registry+https://github.com/rust-lang/crates.io-index"
3132-
checksum = "3e632ef08ca17458acfd46d2ead3d541a1c249586cd5329f5fe333dacfab6142"
3132+
checksum = "ee549ade784b444ef10c0240c3487ed785aa65d711071f7984246b15329a17b6"
31333133

31343134
[[package]]
31353135
name = "rustc-ap-rustc_data_structures"
3136-
version = "583.0.0"
3136+
version = "606.0.0"
31373137
source = "registry+https://github.com/rust-lang/crates.io-index"
3138-
checksum = "e89e2c7be68185418f3cd56af3df8b29007a59a1cebefa63612d055f9bcb1a36"
3138+
checksum = "ca545744a5a9b42e3d0410d6290d40de96dd567253fe77f310c1de4afd213dd4"
31393139
dependencies = [
31403140
"cfg-if",
31413141
"crossbeam-utils 0.6.5",
@@ -3144,8 +3144,9 @@ dependencies = [
31443144
"jobserver",
31453145
"lazy_static 1.3.0",
31463146
"log",
3147-
"parking_lot 0.7.1",
3147+
"parking_lot 0.9.0",
31483148
"rustc-ap-graphviz",
3149+
"rustc-ap-rustc_index",
31493150
"rustc-ap-serialize",
31503151
"rustc-hash",
31513152
"rustc-rayon 0.2.0",
@@ -3156,9 +3157,9 @@ dependencies = [
31563157

31573158
[[package]]
31583159
name = "rustc-ap-rustc_errors"
3159-
version = "583.0.0"
3160+
version = "606.0.0"
31603161
source = "registry+https://github.com/rust-lang/crates.io-index"
3161-
checksum = "1e47cb380abeb72b01e42b2342d592f7eeea7d536c2f1f0d0e550dc509e46333"
3162+
checksum = "a6967a41ed38ef4bce0f559fe9a4801d8ba12ac032f40a12a55e72f79d52c9bb"
31623163
dependencies = [
31633164
"annotate-snippets",
31643165
"atty",
@@ -3171,20 +3172,30 @@ dependencies = [
31713172
"unicode-width",
31723173
]
31733174

3175+
[[package]]
3176+
name = "rustc-ap-rustc_index"
3177+
version = "606.0.0"
3178+
source = "registry+https://github.com/rust-lang/crates.io-index"
3179+
checksum = "457a5c204ae2fdaa5bdb5b196e58ca59896870d80445fe423063c9453496e3ea"
3180+
dependencies = [
3181+
"rustc-ap-serialize",
3182+
"smallvec",
3183+
]
3184+
31743185
[[package]]
31753186
name = "rustc-ap-rustc_lexer"
3176-
version = "583.0.0"
3187+
version = "606.0.0"
31773188
source = "registry+https://github.com/rust-lang/crates.io-index"
3178-
checksum = "494cfaf67f49217d67d0774eeecbba61ac89acf478db97ef11f113ed8a959305"
3189+
checksum = "ed0c064676f8a08e42a36b0d4e4a102465fb0f4b75e11436cb7f66d2c3fa7139"
31793190
dependencies = [
31803191
"unicode-xid 0.2.0",
31813192
]
31823193

31833194
[[package]]
31843195
name = "rustc-ap-rustc_macros"
3185-
version = "583.0.0"
3196+
version = "606.0.0"
31863197
source = "registry+https://github.com/rust-lang/crates.io-index"
3187-
checksum = "e2e5d36becc59b4497f9cbd3ae0610081de0207a1d0e95c066369167b14f486f"
3198+
checksum = "b2d77e46159c5288c585decbcdc9d742889c65e307c31e104c7a36d63fe1f5d0"
31883199
dependencies = [
31893200
"itertools 0.8.0",
31903201
"proc-macro2 0.4.30",
@@ -3195,40 +3206,41 @@ dependencies = [
31953206

31963207
[[package]]
31973208
name = "rustc-ap-rustc_target"
3198-
version = "583.0.0"
3209+
version = "606.0.0"
31993210
source = "registry+https://github.com/rust-lang/crates.io-index"
3200-
checksum = "a7bfc5f96dfc3b9f8d5b57884f7f37467ecff6776cd4b8b491a7daece6fdd7c2"
3211+
checksum = "86ca895350b0de14d064b499168c93fa183958d5462eb042c927d93623e41ec1"
32013212
dependencies = [
32023213
"bitflags",
32033214
"log",
32043215
"rustc-ap-rustc_data_structures",
3216+
"rustc-ap-rustc_index",
32053217
"rustc-ap-serialize",
32063218
"rustc-ap-syntax_pos",
32073219
]
32083220

32093221
[[package]]
32103222
name = "rustc-ap-serialize"
3211-
version = "583.0.0"
3223+
version = "606.0.0"
32123224
source = "registry+https://github.com/rust-lang/crates.io-index"
3213-
checksum = "2bb9ee231cf79eded39c56647499f83d6136ff5c8c0baaa9e21b6febee00f4f6"
3225+
checksum = "92679240e86f4583cc05f8dcf6439bdab87bac9e6555718469176de9bd52ba20"
32143226
dependencies = [
32153227
"indexmap",
32163228
"smallvec",
32173229
]
32183230

32193231
[[package]]
32203232
name = "rustc-ap-syntax"
3221-
version = "583.0.0"
3233+
version = "606.0.0"
32223234
source = "registry+https://github.com/rust-lang/crates.io-index"
3223-
checksum = "b3827fc208814efbde82d613e31d11b4250ce9e8cf8afe4a4d47bbbd099632c9"
3235+
checksum = "0a0c30f8e38c847dbfd9e2f1e472ab06d0bd0a23ab53ae4c5a44912842ce834e"
32243236
dependencies = [
32253237
"bitflags",
32263238
"lazy_static 1.3.0",
32273239
"log",
32283240
"rustc-ap-rustc_data_structures",
32293241
"rustc-ap-rustc_errors",
3242+
"rustc-ap-rustc_index",
32303243
"rustc-ap-rustc_lexer",
3231-
"rustc-ap-rustc_macros",
32323244
"rustc-ap-rustc_target",
32333245
"rustc-ap-serialize",
32343246
"rustc-ap-syntax_pos",
@@ -3238,13 +3250,14 @@ dependencies = [
32383250

32393251
[[package]]
32403252
name = "rustc-ap-syntax_pos"
3241-
version = "583.0.0"
3253+
version = "606.0.0"
32423254
source = "registry+https://github.com/rust-lang/crates.io-index"
3243-
checksum = "930ed81c34f325e512cc315c04d676fa84a373879d5c43bb54054a0522b05213"
3255+
checksum = "2bdaa0fb40143b4b878256ac4e2b498885daafc269502504d91929eab4744bf4"
32443256
dependencies = [
32453257
"cfg-if",
32463258
"rustc-ap-arena",
32473259
"rustc-ap-rustc_data_structures",
3260+
"rustc-ap-rustc_index",
32483261
"rustc-ap-rustc_macros",
32493262
"rustc-ap-serialize",
32503263
"scoped-tls",
@@ -3846,7 +3859,7 @@ dependencies = [
38463859

38473860
[[package]]
38483861
name = "rustfmt-nightly"
3849-
version = "1.4.8"
3862+
version = "1.4.9"
38503863
dependencies = [
38513864
"annotate-snippets",
38523865
"bytecount",

src/tools/rls

Submodule rls updated from 8dc9ba9 to a18df16

src/tools/rustfmt

0 commit comments

Comments
 (0)