Skip to content

Commit 96dd469

Browse files
borsbors
committed
Auto merge of #72671 - flip1995:clippyup, r=Xanewok
Update Clippy, RLS, and rustfmt r? @Dylan-DPC This makes Clippy test-pass again: 3089c3b Otherwise this includes bugfixes and a few new lints. Fixes #72231 Fixes #72232
2 parents 77f95a8 + 3f3e0ee commit 96dd469

File tree

89 files changed

+1607
-480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1607
-480
lines changed

‎Cargo.lock‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,12 @@ dependencies = [
551551
"lazy_static",
552552
"pulldown-cmark 0.7.1",
553553
"quine-mc_cluskey",
554+
"quote 1.0.2",
554555
"regex-syntax",
555556
"semver 0.9.0",
556557
"serde",
557558
"smallvec 1.4.0",
559+
"syn 1.0.11",
558560
"toml",
559561
"unicode-normalization",
560562
"url 2.1.0",
@@ -2784,9 +2786,9 @@ dependencies = [
27842786

27852787
[[package]]
27862788
name = "racer"
2787-
version = "2.1.33"
2789+
version = "2.1.34"
27882790
source = "registry+https://github.com/rust-lang/crates.io-index"
2789-
checksum = "54322b696f7df20e0d79d0244a1088f387b7164a5f17987c4ab984dec1a23e42"
2791+
checksum = "cc9caecf1286a3ed28d3ae35207a178ba12e58de95540781e5c6cba05e0f0833"
27902792
dependencies = [
27912793
"bitflags",
27922794
"clap",
@@ -3212,25 +3214,25 @@ dependencies = [
32123214

32133215
[[package]]
32143216
name = "rustc-ap-arena"
3215-
version = "654.0.0"
3217+
version = "659.0.0"
32163218
source = "registry+https://github.com/rust-lang/crates.io-index"
3217-
checksum = "81dfcfbb0ddfd533abf8c076e3b49d1e5042d1962526a12ce2c66d514b24cca3"
3219+
checksum = "fdaf0295fc40b10ec1091aad1a1760b4bb3b4e7c4f77d543d1a2e9d50a01e6b1"
32183220
dependencies = [
32193221
"rustc-ap-rustc_data_structures",
32203222
"smallvec 1.4.0",
32213223
]
32223224

32233225
[[package]]
32243226
name = "rustc-ap-graphviz"
3225-
version = "654.0.0"
3227+
version = "659.0.0"
32263228
source = "registry+https://github.com/rust-lang/crates.io-index"
3227-
checksum = "7490bb07b014a7f9531bde33c905a805e08095dbefdb4c9988a1b19fe6d019fd"
3229+
checksum = "8028e8cdb4eb71810d0c22a5a5e1e3106c81123be63ce7f044b6d4ac100d8941"
32283230

32293231
[[package]]
32303232
name = "rustc-ap-rustc_ast"
3231-
version = "654.0.0"
3233+
version = "659.0.0"
32323234
source = "registry+https://github.com/rust-lang/crates.io-index"
3233-
checksum = "189f16dbb8dd11089274c9ced58b0cae9e1ea3e434a58f3db683817eda849e58"
3235+
checksum = "16e9e502bb3a5568433db1cf2fb1f1e1074934636069cf744ad7c77b58e1428e"
32343236
dependencies = [
32353237
"log",
32363238
"rustc-ap-rustc_data_structures",
@@ -3245,9 +3247,9 @@ dependencies = [
32453247

32463248
[[package]]
32473249
name = "rustc-ap-rustc_ast_passes"
3248-
version = "654.0.0"
3250+
version = "659.0.0"
32493251
source = "registry+https://github.com/rust-lang/crates.io-index"
3250-
checksum = "bbe619609b56a617fa986332b066d53270093c816d8ff8281fc90e1dbe74c1cc"
3252+
checksum = "faf35ffecab28f97f7ac01cf6a13afaca6408529d15eb95f317a43b2ffb88933"
32513253
dependencies = [
32523254
"itertools 0.8.0",
32533255
"log",
@@ -3264,21 +3266,20 @@ dependencies = [
32643266

32653267
[[package]]
32663268
name = "rustc-ap-rustc_ast_pretty"
3267-
version = "654.0.0"
3269+
version = "659.0.0"
32683270
source = "registry+https://github.com/rust-lang/crates.io-index"
3269-
checksum = "26ab1495f7b420e937688749c1da5763aaabd6ebe8cacb758665a0b8481da094"
3271+
checksum = "3684ed43dc552f1e030e3f7a5a300a7a834bdda4e9e00ab80284be4220d8c603"
32703272
dependencies = [
32713273
"log",
32723274
"rustc-ap-rustc_ast",
3273-
"rustc-ap-rustc_data_structures",
32743275
"rustc-ap-rustc_span",
32753276
]
32763277

32773278
[[package]]
32783279
name = "rustc-ap-rustc_attr"
3279-
version = "654.0.0"
3280+
version = "659.0.0"
32803281
source = "registry+https://github.com/rust-lang/crates.io-index"
3281-
checksum = "2e057495724c60729c1d1d9d49374e0b3ebd6d3481cd161b2871f52fe017b7b5"
3282+
checksum = "31b413927daa666983b3b49227f9ac218aa29254546abdb585f20cd71c391870"
32823283
dependencies = [
32833284
"rustc-ap-rustc_ast",
32843285
"rustc-ap-rustc_ast_pretty",
@@ -3289,19 +3290,19 @@ dependencies = [
32893290
"rustc-ap-rustc_session",
32903291
"rustc-ap-rustc_span",
32913292
"rustc-ap-serialize",
3292-
"smallvec 1.4.0",
3293+
"version_check",
32933294
]
32943295

32953296
[[package]]
32963297
name = "rustc-ap-rustc_data_structures"
3297-
version = "654.0.0"
3298+
version = "659.0.0"
32983299
source = "registry+https://github.com/rust-lang/crates.io-index"
3299-
checksum = "d2130997667833692f4bec4681d0e73b066d5a01dac1d8a68f22068b82bf173a"
3300+
checksum = "4b1c6069e5c522657f1c6f5ab33074e097092f48e804cc896d337e319aacbd60"
33003301
dependencies = [
33013302
"bitflags",
33023303
"cfg-if",
33033304
"crossbeam-utils 0.7.2",
3304-
"ena 0.13.1",
3305+
"ena 0.14.0",
33053306
"indexmap",
33063307
"jobserver",
33073308
"lazy_static",
@@ -3317,14 +3318,15 @@ dependencies = [
33173318
"rustc-rayon-core",
33183319
"smallvec 1.4.0",
33193320
"stable_deref_trait",
3321+
"stacker",
33203322
"winapi 0.3.8",
33213323
]
33223324

33233325
[[package]]
33243326
name = "rustc-ap-rustc_errors"
3325-
version = "654.0.0"
3327+
version = "659.0.0"
33263328
source = "registry+https://github.com/rust-lang/crates.io-index"
3327-
checksum = "908e1ea187c6bb368af4ba6db980001e920515e67371ddc4086e749baabe6080"
3329+
checksum = "0c374e89b3c9714869ef86076942155383804ba6778c26be2169d324563c31f9"
33283330
dependencies = [
33293331
"annotate-snippets",
33303332
"atty",
@@ -3340,9 +3342,9 @@ dependencies = [
33403342

33413343
[[package]]
33423344
name = "rustc-ap-rustc_expand"
3343-
version = "654.0.0"
3345+
version = "659.0.0"
33443346
source = "registry+https://github.com/rust-lang/crates.io-index"
3345-
checksum = "50066a75bca872ff933b0ee8a582d18ef1876c8054a392f60c39e538446bfb00"
3347+
checksum = "259d2a7aa7a12f3c99a4ce4123643ec065f1a26f8e89be1f9bedd9757ea53fdc"
33463348
dependencies = [
33473349
"log",
33483350
"rustc-ap-rustc_ast",
@@ -3362,9 +3364,9 @@ dependencies = [
33623364

33633365
[[package]]
33643366
name = "rustc-ap-rustc_feature"
3365-
version = "654.0.0"
3367+
version = "659.0.0"
33663368
source = "registry+https://github.com/rust-lang/crates.io-index"
3367-
checksum = "96fb53e1710e6de7c2e371ca56c857b79f9b399aba58aa6b6fbed6e2f677d3f6"
3369+
checksum = "c0296fbc29b629d5ae2ebee1bbf0407bb22de04d26d87216c20899b79579ccb3"
33683370
dependencies = [
33693371
"lazy_static",
33703372
"rustc-ap-rustc_data_structures",
@@ -3373,34 +3375,34 @@ dependencies = [
33733375

33743376
[[package]]
33753377
name = "rustc-ap-rustc_fs_util"
3376-
version = "654.0.0"
3378+
version = "659.0.0"
33773379
source = "registry+https://github.com/rust-lang/crates.io-index"
3378-
checksum = "e3f91357e5e468fc2729211571d769723c728a34e200d90a70164e945f881e09"
3380+
checksum = "34734f6cc681399630acd836a14207c6b5b9671a290cc7cad0354b0a4d71b3c9"
33793381

33803382
[[package]]
33813383
name = "rustc-ap-rustc_index"
3382-
version = "654.0.0"
3384+
version = "659.0.0"
33833385
source = "registry+https://github.com/rust-lang/crates.io-index"
3384-
checksum = "32220c3e6cdf226f38e4474b747dca15f3106bb680c74f10b299af3f6cdb1663"
3386+
checksum = "d1e4508753d71d3523209c2ca5086db15a1413e71ebf17ad5412bb7ced5e44c2"
33853387
dependencies = [
33863388
"rustc-ap-serialize",
33873389
"smallvec 1.4.0",
33883390
]
33893391

33903392
[[package]]
33913393
name = "rustc-ap-rustc_lexer"
3392-
version = "654.0.0"
3394+
version = "659.0.0"
33933395
source = "registry+https://github.com/rust-lang/crates.io-index"
3394-
checksum = "3b324d2a2bacad344e53e182e5ca04ffb74745b932849aa074f8f7fec8177da5"
3396+
checksum = "42b9fcd8407e322908a721262fbc0b35b5f3c35bb173a26dd1e0070bde336e33"
33953397
dependencies = [
33963398
"unicode-xid 0.2.0",
33973399
]
33983400

33993401
[[package]]
34003402
name = "rustc-ap-rustc_macros"
3401-
version = "654.0.0"
3403+
version = "659.0.0"
34023404
source = "registry+https://github.com/rust-lang/crates.io-index"
3403-
checksum = "59686c56d5f1b3ed47d0f070c257ed35caf24ecf2d744dd11fe44b1014baee0f"
3405+
checksum = "3d104115a689367d2e0bcd99f37e0ebd6b9c8c78bab0d9cbea5bae86323601b5"
34043406
dependencies = [
34053407
"proc-macro2 1.0.3",
34063408
"quote 1.0.2",
@@ -3410,9 +3412,9 @@ dependencies = [
34103412

34113413
[[package]]
34123414
name = "rustc-ap-rustc_parse"
3413-
version = "654.0.0"
3415+
version = "659.0.0"
34143416
source = "registry+https://github.com/rust-lang/crates.io-index"
3415-
checksum = "2dfb0c11c591ec5f87bbadb10819795abc9035ff79a26703c1b6c9487ac51f49"
3417+
checksum = "afaaab91853fc5a3916785ccae727a4433359d9787c260d42b96a2265fe5b287"
34163418
dependencies = [
34173419
"bitflags",
34183420
"log",
@@ -3424,15 +3426,14 @@ dependencies = [
34243426
"rustc-ap-rustc_lexer",
34253427
"rustc-ap-rustc_session",
34263428
"rustc-ap-rustc_span",
3427-
"smallvec 1.4.0",
34283429
"unicode-normalization",
34293430
]
34303431

34313432
[[package]]
34323433
name = "rustc-ap-rustc_session"
3433-
version = "654.0.0"
3434+
version = "659.0.0"
34343435
source = "registry+https://github.com/rust-lang/crates.io-index"
3435-
checksum = "3d1a194b1a81d7233ee492847638dc9ebdb7d084300e5ade8dea0ceaa98f95b9"
3436+
checksum = "86e756a57ce6ce1b868e35e64a7e10ab28d49ece80d7c661b07aff5afc6e5d2d"
34363437
dependencies = [
34373438
"getopts",
34383439
"log",
@@ -3450,9 +3451,9 @@ dependencies = [
34503451

34513452
[[package]]
34523453
name = "rustc-ap-rustc_span"
3453-
version = "654.0.0"
3454+
version = "659.0.0"
34543455
source = "registry+https://github.com/rust-lang/crates.io-index"
3455-
checksum = "a648146050fed6b58e681ec22488e728f60e16036bb7497c9815e3debd1e4242"
3456+
checksum = "21031c3396ee452f4c6e994b67513a633055c57c86d00336afd9d63149518f34"
34563457
dependencies = [
34573458
"cfg-if",
34583459
"log",
@@ -3469,9 +3470,9 @@ dependencies = [
34693470

34703471
[[package]]
34713472
name = "rustc-ap-rustc_target"
3472-
version = "654.0.0"
3473+
version = "659.0.0"
34733474
source = "registry+https://github.com/rust-lang/crates.io-index"
3474-
checksum = "28cf28798f0988b808e3616713630e4098d68c6f1f41052a2f7e922e094da744"
3475+
checksum = "ff21badfbead5b0050391eaad8840f2e4fcb03b6b0fc6006f447443529e9ae6e"
34753476
dependencies = [
34763477
"bitflags",
34773478
"log",
@@ -3484,9 +3485,9 @@ dependencies = [
34843485

34853486
[[package]]
34863487
name = "rustc-ap-serialize"
3487-
version = "654.0.0"
3488+
version = "659.0.0"
34883489
source = "registry+https://github.com/rust-lang/crates.io-index"
3489-
checksum = "756e8f526ec7906e132188bf25e3c10a6ee42ab77294ecb3b3602647f0508eef"
3490+
checksum = "768b5a305669d934522712bc13502962edfde5128ea63b9e7db4000410be1dc6"
34903491
dependencies = [
34913492
"indexmap",
34923493
"smallvec 1.4.0",
@@ -4459,7 +4460,7 @@ dependencies = [
44594460

44604461
[[package]]
44614462
name = "rustfmt-nightly"
4462-
version = "1.4.14"
4463+
version = "1.4.15"
44634464
dependencies = [
44644465
"annotate-snippets",
44654466
"bytecount",
@@ -4477,6 +4478,7 @@ dependencies = [
44774478
"regex",
44784479
"rustc-ap-rustc_ast",
44794480
"rustc-ap-rustc_ast_pretty",
4481+
"rustc-ap-rustc_attr",
44804482
"rustc-ap-rustc_data_structures",
44814483
"rustc-ap-rustc_errors",
44824484
"rustc-ap-rustc_expand",

‎src/bootstrap/tool.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@ pub fn prepare_tool_cargo(
252252
// own copy
253253
cargo.env("LZMA_API_STATIC", "1");
254254

255+
// CFG_RELEASE is needed by rustfmt (and possibly other tools) which
256+
// import rustc-ap-rustc_attr which requires this to be set for the
257+
// `#[cfg(version(...))]` attribute.
258+
cargo.env("CFG_RELEASE", builder.rust_release());
255259
cargo.env("CFG_RELEASE_CHANNEL", &builder.config.channel);
256260
cargo.env("CFG_VERSION", builder.rust_version());
257261
cargo.env("CFG_RELEASE_NUM", channel::CFG_RELEASE_NUM);

‎src/tools/clippy/.github/workflows/clippy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: cargo update
5050

5151
- name: Cache cargo dir
52-
uses: actions/cache@v1
52+
uses: actions/cache@v2
5353
with:
5454
path: ~/.cargo
5555
key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}

‎src/tools/clippy/.github/workflows/clippy_bors.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
run: cargo update
9595

9696
- name: Cache cargo dir
97-
uses: actions/cache@v1
97+
uses: actions/cache@v2
9898
with:
9999
path: ~/.cargo
100100
key: ${{ runner.os }}-${{ matrix.host }}-${{ hashFiles('Cargo.lock') }}
@@ -190,7 +190,7 @@ jobs:
190190
run: cargo update
191191

192192
- name: Cache cargo dir
193-
uses: actions/cache@v1
193+
uses: actions/cache@v2
194194
with:
195195
path: ~/.cargo
196196
key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
@@ -269,7 +269,7 @@ jobs:
269269
run: cargo update
270270

271271
- name: Cache cargo dir
272-
uses: actions/cache@v1
272+
uses: actions/cache@v2
273273
with:
274274
path: ~/.cargo
275275
key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
@@ -312,7 +312,7 @@ jobs:
312312
name: bors test finished
313313
if: github.event.pusher.name == 'bors' && success()
314314
runs-on: ubuntu-latest
315-
needs: [base, integration]
315+
needs: [changelog, base, integration_build, integration]
316316

317317
steps:
318318
- name: Mark the job as successful
@@ -322,7 +322,7 @@ jobs:
322322
name: bors test finished
323323
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
324324
runs-on: ubuntu-latest
325-
needs: [base, integration]
325+
needs: [changelog, base, integration_build, integration]
326326

327327
steps:
328328
- name: Mark the job as a failure

‎src/tools/clippy/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,7 @@ Released 2018-09-13
14391439
[`match_same_arms`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_same_arms
14401440
[`match_single_binding`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_single_binding
14411441
[`match_wild_err_arm`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_wild_err_arm
1442+
[`match_wildcard_for_single_variants`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_wildcard_for_single_variants
14421443
[`maybe_infinite_iter`]: https://rust-lang.github.io/rust-clippy/master/index.html#maybe_infinite_iter
14431444
[`mem_discriminant_non_enum`]: https://rust-lang.github.io/rust-clippy/master/index.html#mem_discriminant_non_enum
14441445
[`mem_forget`]: https://rust-lang.github.io/rust-clippy/master/index.html#mem_forget

0 commit comments

Comments
 (0)