Skip to content

Commit 7c533c8

Browse files
borsbors
committed
Auto merge of #78310 - ebroto:clippyup, r=Manishearth
Update Clippy Biweekly Clippy update. This includes a Cargo.lock update: [ca11eeb ](ca11eeb) (should be rollup=never) r? `@Manishearth`
2 parents f58ffc9 + a513919 commit 7c533c8

Some content is hidden

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

76 files changed

+2159
-577
lines changed

‎Cargo.lock

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,17 @@ dependencies = [
418418
"serde_json",
419419
]
420420

421+
[[package]]
422+
name = "cargo_metadata"
423+
version = "0.12.0"
424+
source = "registry+https://github.com/rust-lang/crates.io-index"
425+
checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
426+
dependencies = [
427+
"semver 0.11.0",
428+
"serde",
429+
"serde_json",
430+
]
431+
421432
[[package]]
422433
name = "cargotest2"
423434
version = "0.1.0"
@@ -530,15 +541,14 @@ dependencies = [
530541
name = "clippy"
531542
version = "0.0.212"
532543
dependencies = [
533-
"cargo_metadata 0.11.1",
544+
"cargo_metadata 0.12.0",
534545
"clippy-mini-macro-test",
535546
"clippy_lints",
536547
"compiletest_rs",
537548
"derive-new",
538-
"lazy_static",
539549
"rustc-workspace-hack",
540550
"rustc_tools_util 0.2.0",
541-
"semver 0.10.0",
551+
"semver 0.11.0",
542552
"serde",
543553
"tempfile",
544554
"tester",
@@ -552,14 +562,14 @@ version = "0.2.0"
552562
name = "clippy_lints"
553563
version = "0.0.212"
554564
dependencies = [
555-
"cargo_metadata 0.11.1",
565+
"cargo_metadata 0.12.0",
556566
"if_chain",
557567
"itertools 0.9.0",
558568
"pulldown-cmark 0.8.0",
559569
"quine-mc_cluskey",
560570
"quote",
561571
"regex-syntax",
562-
"semver 0.10.0",
572+
"semver 0.11.0",
563573
"serde",
564574
"smallvec 1.4.2",
565575
"syn",
@@ -4373,7 +4383,7 @@ version = "0.9.0"
43734383
source = "registry+https://github.com/rust-lang/crates.io-index"
43744384
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
43754385
dependencies = [
4376-
"semver-parser",
4386+
"semver-parser 0.7.0",
43774387
"serde",
43784388
]
43794389

@@ -4383,7 +4393,17 @@ version = "0.10.0"
43834393
source = "registry+https://github.com/rust-lang/crates.io-index"
43844394
checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
43854395
dependencies = [
4386-
"semver-parser",
4396+
"semver-parser 0.7.0",
4397+
"serde",
4398+
]
4399+
4400+
[[package]]
4401+
name = "semver"
4402+
version = "0.11.0"
4403+
source = "registry+https://github.com/rust-lang/crates.io-index"
4404+
checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
4405+
dependencies = [
4406+
"semver-parser 0.10.1",
43874407
"serde",
43884408
]
43894409

@@ -4393,6 +4413,15 @@ version = "0.7.0"
43934413
source = "registry+https://github.com/rust-lang/crates.io-index"
43944414
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
43954415

4416+
[[package]]
4417+
name = "semver-parser"
4418+
version = "0.10.1"
4419+
source = "registry+https://github.com/rust-lang/crates.io-index"
4420+
checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
4421+
dependencies = [
4422+
"pest",
4423+
]
4424+
43964425
[[package]]
43974426
name = "serde"
43984427
version = "1.0.115"
@@ -4424,9 +4453,9 @@ dependencies = [
44244453

44254454
[[package]]
44264455
name = "serde_json"
4427-
version = "1.0.57"
4456+
version = "1.0.59"
44284457
source = "registry+https://github.com/rust-lang/crates.io-index"
4429-
checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
4458+
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
44304459
dependencies = [
44314460
"itoa",
44324461
"ryu",

‎src/tools/clippy/.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ your PR is merged.
1212
If you added a new lint, here's a checklist for things that will be
1313
checked during review or continuous integration.
1414

15-
- [ ] Followed [lint naming conventions][lint_naming]
16-
- [ ] Added passing UI tests (including committed `.stderr` file)
17-
- [ ] `cargo test` passes locally
18-
- [ ] Executed `cargo dev update_lints`
19-
- [ ] Added lint documentation
20-
- [ ] Run `cargo dev fmt`
15+
- \[ ] Followed [lint naming conventions][lint_naming]
16+
- \[ ] Added passing UI tests (including committed `.stderr` file)
17+
- \[ ] `cargo test` passes locally
18+
- \[ ] Executed `cargo dev update_lints`
19+
- \[ ] Added lint documentation
20+
- \[ ] Run `cargo dev fmt`
2121

2222
[lint_naming]: https://rust-lang.github.io/rfcs/0344-conventions-galore.html#lints
2323

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
github_token: "${{ secrets.github_token }}"
3737

3838
- name: rust-toolchain
39-
uses: actions-rs/[email protected].3
39+
uses: actions-rs/[email protected].6
4040
with:
4141
toolchain: nightly
4242
target: x86_64-unknown-linux-gnu
4343
profile: minimal
4444

4545
- name: Checkout
46-
uses: actions/checkout@v2.0.0
46+
uses: actions/checkout@v2.3.3
4747

4848
- name: Run cargo update
4949
run: cargo update
@@ -63,7 +63,7 @@ jobs:
6363
- name: Set LD_LIBRARY_PATH (Linux)
6464
run: |
6565
SYSROOT=$(rustc --print sysroot)
66-
echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
66+
echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV
6767
6868
- name: Build
6969
run: cargo build --features deny-warnings

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

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ env:
1111
CARGO_TARGET_DIR: '${{ github.workspace }}/target'
1212
NO_FMT_TEST: 1
1313

14+
defaults:
15+
run:
16+
shell: bash
17+
1418
jobs:
1519
changelog:
1620
runs-on: ubuntu-latest
@@ -20,7 +24,7 @@ jobs:
2024
with:
2125
github_token: "${{ secrets.github_token }}"
2226
- name: Checkout
23-
uses: actions/checkout@v2.0.0
27+
uses: actions/checkout@v2.3.3
2428
with:
2529
ref: ${{ github.ref }}
2630

@@ -81,14 +85,14 @@ jobs:
8185
if: matrix.host == 'i686-unknown-linux-gnu'
8286

8387
- name: rust-toolchain
84-
uses: actions-rs/[email protected].3
88+
uses: actions-rs/[email protected].6
8589
with:
8690
toolchain: nightly
8791
target: ${{ matrix.host }}
8892
profile: minimal
8993

9094
- name: Checkout
91-
uses: actions/checkout@v2.0.0
95+
uses: actions/checkout@v2.3.3
9296

9397
- name: Run cargo update
9498
run: cargo update
@@ -105,14 +109,13 @@ jobs:
105109
run: bash setup-toolchain.sh
106110
env:
107111
HOST_TOOLCHAIN: ${{ matrix.host }}
108-
shell: bash
109112

110113
# Run
111114
- name: Set LD_LIBRARY_PATH (Linux)
112115
if: runner.os == 'Linux'
113116
run: |
114117
SYSROOT=$(rustc --print sysroot)
115-
echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
118+
echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV
116119
- name: Link rustc dylib (MacOS)
117120
if: runner.os == 'macOS'
118121
run: |
@@ -122,41 +125,33 @@ jobs:
122125
- name: Set PATH (Windows)
123126
if: runner.os == 'Windows'
124127
run: |
125-
$sysroot = rustc --print sysroot
126-
$env:PATH += ';' + $sysroot + '\bin'
127-
echo "::set-env name=PATH::$env:PATH"
128+
SYSROOT=$(rustc --print sysroot)
129+
echo "$SYSROOT/bin" >> $GITHUB_PATH
128130
129131
- name: Build
130132
run: cargo build --features deny-warnings
131-
shell: bash
132133

133134
- name: Test
134135
run: cargo test --features deny-warnings
135-
shell: bash
136136

137137
- name: Test clippy_lints
138138
run: cargo test --features deny-warnings
139-
shell: bash
140139
working-directory: clippy_lints
141140

142141
- name: Test rustc_tools_util
143142
run: cargo test --features deny-warnings
144-
shell: bash
145143
working-directory: rustc_tools_util
146144

147145
- name: Test clippy_dev
148146
run: cargo test --features deny-warnings
149-
shell: bash
150147
working-directory: clippy_dev
151148

152149
- name: Test cargo-clippy
153150
run: ../target/debug/cargo-clippy
154-
shell: bash
155151
working-directory: clippy_workspace_tests
156152

157153
- name: Test clippy-driver
158154
run: bash .github/driver.sh
159-
shell: bash
160155
env:
161156
OS: ${{ runner.os }}
162157

@@ -165,7 +160,7 @@ jobs:
165160
run: |
166161
cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
167162
cargo cache
168-
shell: bash
163+
169164
integration_build:
170165
needs: changelog
171166
runs-on: ubuntu-latest
@@ -177,14 +172,14 @@ jobs:
177172
github_token: "${{ secrets.github_token }}"
178173

179174
- name: rust-toolchain
180-
uses: actions-rs/[email protected].3
175+
uses: actions-rs/[email protected].6
181176
with:
182177
toolchain: nightly
183178
target: x86_64-unknown-linux-gnu
184179
profile: minimal
185180

186181
- name: Checkout
187-
uses: actions/checkout@v2.0.0
182+
uses: actions/checkout@v2.3.3
188183

189184
- name: Run cargo update
190185
run: cargo update
@@ -258,14 +253,14 @@ jobs:
258253
github_token: "${{ secrets.github_token }}"
259254

260255
- name: rust-toolchain
261-
uses: actions-rs/[email protected].3
256+
uses: actions-rs/[email protected].6
262257
with:
263258
toolchain: nightly
264259
target: x86_64-unknown-linux-gnu
265260
profile: minimal
266261

267262
- name: Checkout
268-
uses: actions/checkout@v2.0.0
263+
uses: actions/checkout@v2.3.3
269264

270265
- name: Run cargo update
271266
run: cargo update

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
steps:
2424
# Setup
2525
- name: rust-toolchain
26-
uses: actions-rs/[email protected].3
26+
uses: actions-rs/[email protected].6
2727
with:
2828
toolchain: nightly
2929
target: x86_64-unknown-linux-gnu
3030
profile: minimal
3131
components: rustfmt
3232

3333
- name: Checkout
34-
uses: actions/checkout@v2.0.0
34+
uses: actions/checkout@v2.3.3
3535

3636
# Run
3737
- name: Build

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
steps:
2222
# Setup
2323
- name: Checkout
24-
uses: actions/checkout@v2.0.0
24+
uses: actions/checkout@v2.3.3
2525

2626
- name: Checkout
27-
uses: actions/checkout@v2.0.0
27+
uses: actions/checkout@v2.3.3
2828
with:
2929
ref: ${{ env.TARGET_BRANCH }}
3030
path: 'out'
@@ -34,10 +34,10 @@ jobs:
3434
if: startswith(github.ref, 'refs/tags/')
3535
run: |
3636
TAG=$(basename ${{ github.ref }})
37-
echo "::set-env name=TAG_NAME::$TAG"
37+
echo "TAG_NAME=$TAG" >> $GITHUB_ENV
3838
- name: Set beta to true
3939
if: github.ref == 'refs/heads/beta'
40-
run: echo "::set-env name=BETA::true"
40+
run: echo "BETA=true" >> $GITHUB_ENV
4141

4242
- name: Use scripts and templates from master branch
4343
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
# Setup
1818
- name: Checkout
19-
uses: actions/checkout@v2.0.0
19+
uses: actions/checkout@v2.3.3
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@v1.1.0
22+
uses: actions/setup-node@v1.4.4
2323

2424
- name: Install remark
2525
run: npm install remark-cli remark-lint remark-lint-maximum-line-length remark-preset-lint-recommended

‎src/tools/clippy/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,6 +1796,7 @@ Released 2018-09-13
17961796
[`manual_saturating_arithmetic`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_saturating_arithmetic
17971797
[`manual_strip`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_strip
17981798
[`manual_swap`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_swap
1799+
[`manual_unwrap_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_unwrap_or
17991800
[`many_single_char_names`]: https://rust-lang.github.io/rust-clippy/master/index.html#many_single_char_names
18001801
[`map_clone`]: https://rust-lang.github.io/rust-clippy/master/index.html#map_clone
18011802
[`map_entry`]: https://rust-lang.github.io/rust-clippy/master/index.html#map_entry
@@ -1892,6 +1893,7 @@ Released 2018-09-13
18921893
[`print_with_newline`]: https://rust-lang.github.io/rust-clippy/master/index.html#print_with_newline
18931894
[`println_empty_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#println_empty_string
18941895
[`ptr_arg`]: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_arg
1896+
[`ptr_eq`]: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_eq
18951897
[`ptr_offset_with_cast`]: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_offset_with_cast
18961898
[`pub_enum_variant_names`]: https://rust-lang.github.io/rust-clippy/master/index.html#pub_enum_variant_names
18971899
[`question_mark`]: https://rust-lang.github.io/rust-clippy/master/index.html#question_mark
@@ -1917,6 +1919,7 @@ Released 2018-09-13
19171919
[`rest_pat_in_fully_bound_structs`]: https://rust-lang.github.io/rust-clippy/master/index.html#rest_pat_in_fully_bound_structs
19181920
[`result_map_or_into_option`]: https://rust-lang.github.io/rust-clippy/master/index.html#result_map_or_into_option
19191921
[`result_map_unit_fn`]: https://rust-lang.github.io/rust-clippy/master/index.html#result_map_unit_fn
1922+
[`result_unit_err`]: https://rust-lang.github.io/rust-clippy/master/index.html#result_unit_err
19201923
[`reversed_empty_ranges`]: https://rust-lang.github.io/rust-clippy/master/index.html#reversed_empty_ranges
19211924
[`same_functions_in_if_condition`]: https://rust-lang.github.io/rust-clippy/master/index.html#same_functions_in_if_condition
19221925
[`same_item_push`]: https://rust-lang.github.io/rust-clippy/master/index.html#same_item_push

‎src/tools/clippy/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ If you have @bors permissions, you can find an overview of the available
316316
commands [here][homu_instructions].
317317
318318
[triage]: https://forge.rust-lang.org/release/triage-procedure.html
319-
[l-crash]: https://github.com/rust-lang/rust-clippy/labels/L-crash%20%3Aboom%3A
320-
[l-bug]: https://github.com/rust-lang/rust-clippy/labels/L-bug%20%3Abeetle%3A
319+
[l-crash]: https://github.com/rust-lang/rust-clippy/labels/L-crash
320+
[l-bug]: https://github.com/rust-lang/rust-clippy/labels/L-bug
321321
[homu]: https://github.com/rust-lang/homu
322322
[homu_instructions]: https://buildbot2.rust-lang.org/homu/
323323
[homu_queue]: https://buildbot2.rust-lang.org/homu/queue/clippy

0 commit comments

Comments
 (0)