Skip to content

Commit be895b2

Browse files
committed
Auto merge of #71159 - topecongiro:rustfmt-1.4.14, r=Dylan-DPC
Bump rustfmt and rls Close #71076. Close #71077. r? @Xanewok
2 parents ce1ab35 + 84c4514 commit be895b2

File tree

3 files changed

+48
-43
lines changed

3 files changed

+48
-43
lines changed

Cargo.lock

+46-41
Original file line numberDiff line numberDiff line change
@@ -2726,9 +2726,9 @@ dependencies = [
27262726

27272727
[[package]]
27282728
name = "racer"
2729-
version = "2.1.32"
2729+
version = "2.1.33"
27302730
source = "registry+https://github.com/rust-lang/crates.io-index"
2731-
checksum = "e805a6c323d08b26270f0276cef35608456916dc266ef27434edbe666eceeeb5"
2731+
checksum = "54322b696f7df20e0d79d0244a1088f387b7164a5f17987c4ab984dec1a23e42"
27322732
dependencies = [
27332733
"bitflags",
27342734
"clap",
@@ -3168,25 +3168,25 @@ dependencies = [
31683168

31693169
[[package]]
31703170
name = "rustc-ap-arena"
3171-
version = "651.0.0"
3171+
version = "654.0.0"
31723172
source = "registry+https://github.com/rust-lang/crates.io-index"
3173-
checksum = "632704fb93ca8148957191e5d2d827082f93c4aa20cdd242fb46d8cca57029da"
3173+
checksum = "81dfcfbb0ddfd533abf8c076e3b49d1e5042d1962526a12ce2c66d514b24cca3"
31743174
dependencies = [
31753175
"rustc-ap-rustc_data_structures",
31763176
"smallvec 1.0.0",
31773177
]
31783178

31793179
[[package]]
31803180
name = "rustc-ap-graphviz"
3181-
version = "651.0.0"
3181+
version = "654.0.0"
31823182
source = "registry+https://github.com/rust-lang/crates.io-index"
3183-
checksum = "bdd4689b814859c9f1b3e314ed2bde596acac428a256a16894635f600bed46b4"
3183+
checksum = "7490bb07b014a7f9531bde33c905a805e08095dbefdb4c9988a1b19fe6d019fd"
31843184

31853185
[[package]]
31863186
name = "rustc-ap-rustc_ast"
3187-
version = "651.0.0"
3187+
version = "654.0.0"
31883188
source = "registry+https://github.com/rust-lang/crates.io-index"
3189-
checksum = "101c1517d3fd19d083aaca5b113f9965e6ae353a0bb09c49959b0f62b95b75d9"
3189+
checksum = "189f16dbb8dd11089274c9ced58b0cae9e1ea3e434a58f3db683817eda849e58"
31903190
dependencies = [
31913191
"log",
31923192
"rustc-ap-rustc_data_structures",
@@ -3201,10 +3201,11 @@ dependencies = [
32013201

32023202
[[package]]
32033203
name = "rustc-ap-rustc_ast_passes"
3204-
version = "651.0.0"
3204+
version = "654.0.0"
32053205
source = "registry+https://github.com/rust-lang/crates.io-index"
3206-
checksum = "3ab3f5a7e939b37c99d8ca371f09b10bb5b5c85ad5d5b8d1d736ce8248c71be0"
3206+
checksum = "bbe619609b56a617fa986332b066d53270093c816d8ff8281fc90e1dbe74c1cc"
32073207
dependencies = [
3208+
"itertools 0.8.0",
32083209
"log",
32093210
"rustc-ap-rustc_ast",
32103211
"rustc-ap-rustc_ast_pretty",
@@ -3219,9 +3220,9 @@ dependencies = [
32193220

32203221
[[package]]
32213222
name = "rustc-ap-rustc_ast_pretty"
3222-
version = "651.0.0"
3223+
version = "654.0.0"
32233224
source = "registry+https://github.com/rust-lang/crates.io-index"
3224-
checksum = "05046d3a2b8de22b20bcda9a1c063dc5c1f2f721f042b6c2809df2d23c64a13e"
3225+
checksum = "26ab1495f7b420e937688749c1da5763aaabd6ebe8cacb758665a0b8481da094"
32253226
dependencies = [
32263227
"log",
32273228
"rustc-ap-rustc_ast",
@@ -3231,9 +3232,9 @@ dependencies = [
32313232

32323233
[[package]]
32333234
name = "rustc-ap-rustc_attr"
3234-
version = "651.0.0"
3235+
version = "654.0.0"
32353236
source = "registry+https://github.com/rust-lang/crates.io-index"
3236-
checksum = "f00b7ccad6fc3628fb44950435772945a425575f9ea0b3708c536fe75623a6e8"
3237+
checksum = "2e057495724c60729c1d1d9d49374e0b3ebd6d3481cd161b2871f52fe017b7b5"
32373238
dependencies = [
32383239
"rustc-ap-rustc_ast",
32393240
"rustc-ap-rustc_ast_pretty",
@@ -3249,9 +3250,9 @@ dependencies = [
32493250

32503251
[[package]]
32513252
name = "rustc-ap-rustc_data_structures"
3252-
version = "651.0.0"
3253+
version = "654.0.0"
32533254
source = "registry+https://github.com/rust-lang/crates.io-index"
3254-
checksum = "4c6121ab6766644fa76b711f65d4c39f2e335488ab768324567fed0ed191166e"
3255+
checksum = "d2130997667833692f4bec4681d0e73b066d5a01dac1d8a68f22068b82bf173a"
32553256
dependencies = [
32563257
"bitflags",
32573258
"cfg-if",
@@ -3260,6 +3261,7 @@ dependencies = [
32603261
"indexmap",
32613262
"jobserver",
32623263
"lazy_static 1.4.0",
3264+
"libc",
32633265
"log",
32643266
"measureme",
32653267
"parking_lot 0.10.0",
@@ -3276,9 +3278,9 @@ dependencies = [
32763278

32773279
[[package]]
32783280
name = "rustc-ap-rustc_errors"
3279-
version = "651.0.0"
3281+
version = "654.0.0"
32803282
source = "registry+https://github.com/rust-lang/crates.io-index"
3281-
checksum = "adab84c842003ad1c8435fd71b8d0cc19bf0d702a8a2147d5be06e083db2d207"
3283+
checksum = "908e1ea187c6bb368af4ba6db980001e920515e67371ddc4086e749baabe6080"
32823284
dependencies = [
32833285
"annotate-snippets",
32843286
"atty",
@@ -3294,9 +3296,9 @@ dependencies = [
32943296

32953297
[[package]]
32963298
name = "rustc-ap-rustc_expand"
3297-
version = "651.0.0"
3299+
version = "654.0.0"
32983300
source = "registry+https://github.com/rust-lang/crates.io-index"
3299-
checksum = "bb001df541ea02b65c8e294252530010c6f90e3c6a5716e8e24e58c12dd1cd86"
3301+
checksum = "50066a75bca872ff933b0ee8a582d18ef1876c8054a392f60c39e538446bfb00"
33003302
dependencies = [
33013303
"log",
33023304
"rustc-ap-rustc_ast",
@@ -3316,9 +3318,9 @@ dependencies = [
33163318

33173319
[[package]]
33183320
name = "rustc-ap-rustc_feature"
3319-
version = "651.0.0"
3321+
version = "654.0.0"
33203322
source = "registry+https://github.com/rust-lang/crates.io-index"
3321-
checksum = "446cc60613cc3b05d0bdbcab7feb02305790b5617fa43c532d51ae3223d677a4"
3323+
checksum = "96fb53e1710e6de7c2e371ca56c857b79f9b399aba58aa6b6fbed6e2f677d3f6"
33223324
dependencies = [
33233325
"lazy_static 1.4.0",
33243326
"rustc-ap-rustc_data_structures",
@@ -3327,34 +3329,34 @@ dependencies = [
33273329

33283330
[[package]]
33293331
name = "rustc-ap-rustc_fs_util"
3330-
version = "651.0.0"
3332+
version = "654.0.0"
33313333
source = "registry+https://github.com/rust-lang/crates.io-index"
3332-
checksum = "9ac99d6f67e7db3bb300895630e769ed41bd3e336c0e725870c70e676c1a5ff1"
3334+
checksum = "e3f91357e5e468fc2729211571d769723c728a34e200d90a70164e945f881e09"
33333335

33343336
[[package]]
33353337
name = "rustc-ap-rustc_index"
3336-
version = "651.0.0"
3338+
version = "654.0.0"
33373339
source = "registry+https://github.com/rust-lang/crates.io-index"
3338-
checksum = "5608c1cf50d2251b7e10a138cf6dd388e97f139b21c00b06a22d06f89c6591f6"
3340+
checksum = "32220c3e6cdf226f38e4474b747dca15f3106bb680c74f10b299af3f6cdb1663"
33393341
dependencies = [
33403342
"rustc-ap-serialize",
33413343
"smallvec 1.0.0",
33423344
]
33433345

33443346
[[package]]
33453347
name = "rustc-ap-rustc_lexer"
3346-
version = "651.0.0"
3348+
version = "654.0.0"
33473349
source = "registry+https://github.com/rust-lang/crates.io-index"
3348-
checksum = "74e9c1c6f5dc85977b3adb6fb556b2ff23354d1a12021da15eb1d36353458bde"
3350+
checksum = "3b324d2a2bacad344e53e182e5ca04ffb74745b932849aa074f8f7fec8177da5"
33493351
dependencies = [
33503352
"unicode-xid 0.2.0",
33513353
]
33523354

33533355
[[package]]
33543356
name = "rustc-ap-rustc_macros"
3355-
version = "651.0.0"
3357+
version = "654.0.0"
33563358
source = "registry+https://github.com/rust-lang/crates.io-index"
3357-
checksum = "3226b5ec864312a5d23eb40a5d621ee06bdc0754228d20d6eb76d4ddc4f2d4a1"
3359+
checksum = "59686c56d5f1b3ed47d0f070c257ed35caf24ecf2d744dd11fe44b1014baee0f"
33583360
dependencies = [
33593361
"proc-macro2 1.0.3",
33603362
"quote 1.0.2",
@@ -3364,9 +3366,9 @@ dependencies = [
33643366

33653367
[[package]]
33663368
name = "rustc-ap-rustc_parse"
3367-
version = "651.0.0"
3369+
version = "654.0.0"
33683370
source = "registry+https://github.com/rust-lang/crates.io-index"
3369-
checksum = "ba3b042344c2280b50d5df0058d11379028a8f016a407e575bb3ea8b6c798049"
3371+
checksum = "2dfb0c11c591ec5f87bbadb10819795abc9035ff79a26703c1b6c9487ac51f49"
33703372
dependencies = [
33713373
"bitflags",
33723374
"log",
@@ -3384,10 +3386,11 @@ dependencies = [
33843386

33853387
[[package]]
33863388
name = "rustc-ap-rustc_session"
3387-
version = "651.0.0"
3389+
version = "654.0.0"
33883390
source = "registry+https://github.com/rust-lang/crates.io-index"
3389-
checksum = "ff35ef4b5d9fbcb2fd539c7c908eb3cdd1f68ddbccd042945ef50ae65564f941"
3391+
checksum = "3d1a194b1a81d7233ee492847638dc9ebdb7d084300e5ade8dea0ceaa98f95b9"
33903392
dependencies = [
3393+
"getopts",
33913394
"log",
33923395
"num_cpus",
33933396
"rustc-ap-rustc_ast",
@@ -3403,26 +3406,28 @@ dependencies = [
34033406

34043407
[[package]]
34053408
name = "rustc-ap-rustc_span"
3406-
version = "651.0.0"
3409+
version = "654.0.0"
34073410
source = "registry+https://github.com/rust-lang/crates.io-index"
3408-
checksum = "e323b1f4a824039886eed8e33cad20ea4f492a9f9b3c9441009797c91de3e87a"
3411+
checksum = "a648146050fed6b58e681ec22488e728f60e16036bb7497c9815e3debd1e4242"
34093412
dependencies = [
34103413
"cfg-if",
34113414
"log",
3415+
"md-5",
34123416
"rustc-ap-arena",
34133417
"rustc-ap-rustc_data_structures",
34143418
"rustc-ap-rustc_index",
34153419
"rustc-ap-rustc_macros",
34163420
"rustc-ap-serialize",
34173421
"scoped-tls",
3422+
"sha-1",
34183423
"unicode-width",
34193424
]
34203425

34213426
[[package]]
34223427
name = "rustc-ap-rustc_target"
3423-
version = "651.0.0"
3428+
version = "654.0.0"
34243429
source = "registry+https://github.com/rust-lang/crates.io-index"
3425-
checksum = "e161eb7b3a5b7993c6b480135296dc61476db80041d49dd446422742426e390b"
3430+
checksum = "28cf28798f0988b808e3616713630e4098d68c6f1f41052a2f7e922e094da744"
34263431
dependencies = [
34273432
"bitflags",
34283433
"log",
@@ -3435,9 +3440,9 @@ dependencies = [
34353440

34363441
[[package]]
34373442
name = "rustc-ap-serialize"
3438-
version = "651.0.0"
3443+
version = "654.0.0"
34393444
source = "registry+https://github.com/rust-lang/crates.io-index"
3440-
checksum = "af510a659098d8c45a7303fb882fa780f4a87ec5f5d7a2053521e7d5d7f332c4"
3445+
checksum = "756e8f526ec7906e132188bf25e3c10a6ee42ab77294ecb3b3602647f0508eef"
34413446
dependencies = [
34423447
"indexmap",
34433448
"smallvec 1.0.0",
@@ -4426,7 +4431,7 @@ dependencies = [
44264431

44274432
[[package]]
44284433
name = "rustfmt-nightly"
4429-
version = "1.4.13"
4434+
version = "1.4.14"
44304435
dependencies = [
44314436
"annotate-snippets",
44324437
"bytecount",

src/tools/rustfmt

0 commit comments

Comments
 (0)