Skip to content

Commit 2773383

Browse files
committed
Auto merge of #107886 - flip1995:clippyup, r=Manishearth
Update Clippy r? `@Manishearth` One day late. Sorry forgot about it yesterday :|
2 parents 3574b1a + 5566eb4 commit 2773383

File tree

77 files changed

+2200
-566
lines changed

Some content is hidden

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

77 files changed

+2200
-566
lines changed

Cargo.lock

+8-6
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ dependencies = [
449449
name = "cargo-miri"
450450
version = "0.1.0"
451451
dependencies = [
452-
"cargo_metadata 0.15.0",
452+
"cargo_metadata 0.15.3",
453453
"directories",
454454
"rustc-build-sysroot",
455455
"rustc-workspace-hack",
@@ -540,15 +540,16 @@ dependencies = [
540540

541541
[[package]]
542542
name = "cargo_metadata"
543-
version = "0.15.0"
543+
version = "0.15.3"
544544
source = "registry+https://github.com/rust-lang/crates.io-index"
545-
checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
545+
checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07"
546546
dependencies = [
547547
"camino",
548548
"cargo-platform 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
549549
"semver",
550550
"serde",
551551
"serde_json",
552+
"thiserror",
552553
]
553554

554555
[[package]]
@@ -732,6 +733,7 @@ dependencies = [
732733
name = "clippy"
733734
version = "0.1.69"
734735
dependencies = [
736+
"clap 4.1.4",
735737
"clippy_lints",
736738
"clippy_utils",
737739
"compiletest_rs",
@@ -762,7 +764,7 @@ name = "clippy_dev"
762764
version = "0.0.1"
763765
dependencies = [
764766
"aho-corasick",
765-
"clap 3.2.20",
767+
"clap 4.1.4",
766768
"indoc",
767769
"itertools",
768770
"opener",
@@ -774,7 +776,7 @@ dependencies = [
774776
name = "clippy_lints"
775777
version = "0.1.69"
776778
dependencies = [
777-
"cargo_metadata 0.14.0",
779+
"cargo_metadata 0.15.3",
778780
"clippy_utils",
779781
"declare_clippy_lint",
780782
"if_chain",
@@ -5865,7 +5867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
58655867
checksum = "54ddb6f31025943e2f9d59237f433711c461a43d9415974c3eb3a4902edc1c1f"
58665868
dependencies = [
58675869
"bstr 1.0.1",
5868-
"cargo_metadata 0.15.0",
5870+
"cargo_metadata 0.15.3",
58695871
"color-eyre",
58705872
"colored",
58715873
"crossbeam-channel",

src/tools/clippy/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4383,6 +4383,7 @@ Released 2018-09-13
43834383
[`extend_from_slice`]: https://rust-lang.github.io/rust-clippy/master/index.html#extend_from_slice
43844384
[`extend_with_drain`]: https://rust-lang.github.io/rust-clippy/master/index.html#extend_with_drain
43854385
[`extra_unused_lifetimes`]: https://rust-lang.github.io/rust-clippy/master/index.html#extra_unused_lifetimes
4386+
[`extra_unused_type_parameters`]: https://rust-lang.github.io/rust-clippy/master/index.html#extra_unused_type_parameters
43864387
[`fallible_impl_from`]: https://rust-lang.github.io/rust-clippy/master/index.html#fallible_impl_from
43874388
[`field_reassign_with_default`]: https://rust-lang.github.io/rust-clippy/master/index.html#field_reassign_with_default
43884389
[`filetype_is_file`]: https://rust-lang.github.io/rust-clippy/master/index.html#filetype_is_file

src/tools/clippy/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ filetime = "0.2"
4242
rustc-workspace-hack = "1.0"
4343

4444
# UI test dependencies
45+
clap = { version = "4.1.4", features = ["derive"] }
4546
clippy_utils = { path = "clippy_utils" }
4647
derive-new = "0.5"
4748
if_chain = "1.0"

src/tools/clippy/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
77

8-
[There are over 550 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
8+
[There are over 600 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
99

1010
Lints are divided into categories, each with a default [lint level](https://doc.rust-lang.org/rustc/lints/levels.html).
1111
You can choose how much Clippy is supposed to ~~annoy~~ help you by changing the lint level by category.

src/tools/clippy/book/src/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
A collection of lints to catch common mistakes and improve your
77
[Rust](https://github.com/rust-lang/rust) code.
88

9-
[There are over 550 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
9+
[There are over 600 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
1010

1111
Lints are divided into categories, each with a default [lint
1212
level](https://doc.rust-lang.org/rustc/lints/levels.html). You can choose how

src/tools/clippy/book/src/lint_configuration.md

+23-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Please use that command to update the file and do not edit it by hand.
4343
| [allowed-scripts](#allowed-scripts) | `["Latin"]` |
4444
| [enable-raw-pointer-heuristic-for-send](#enable-raw-pointer-heuristic-for-send) | `true` |
4545
| [max-suggested-slice-pattern-length](#max-suggested-slice-pattern-length) | `3` |
46+
| [await-holding-invalid-types](#await-holding-invalid-types) | `[]` |
4647
| [max-include-file-size](#max-include-file-size) | `1000000` |
4748
| [allow-expect-in-tests](#allow-expect-in-tests) | `false` |
4849
| [allow-unwrap-in-tests](#allow-unwrap-in-tests) | `false` |
@@ -167,6 +168,17 @@ The minimum rust version that the project supports
167168
* [manual_clamp](https://rust-lang.github.io/rust-clippy/master/index.html#manual_clamp)
168169
* [manual_let_else](https://rust-lang.github.io/rust-clippy/master/index.html#manual_let_else)
169170
* [unchecked_duration_subtraction](https://rust-lang.github.io/rust-clippy/master/index.html#unchecked_duration_subtraction)
171+
* [collapsible_str_replace](https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_str_replace)
172+
* [seek_from_current](https://rust-lang.github.io/rust-clippy/master/index.html#seek_from_current)
173+
* [seek_rewind](https://rust-lang.github.io/rust-clippy/master/index.html#seek_rewind)
174+
* [unnecessary_lazy_evaluations](https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_lazy_evaluations)
175+
* [transmute_ptr_to_ref](https://rust-lang.github.io/rust-clippy/master/index.html#transmute_ptr_to_ref)
176+
* [almost_complete_range](https://rust-lang.github.io/rust-clippy/master/index.html#almost_complete_range)
177+
* [needless_borrow](https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow)
178+
* [derivable_impls](https://rust-lang.github.io/rust-clippy/master/index.html#derivable_impls)
179+
* [manual_is_ascii_check](https://rust-lang.github.io/rust-clippy/master/index.html#manual_is_ascii_check)
180+
* [manual_rem_euclid](https://rust-lang.github.io/rust-clippy/master/index.html#manual_rem_euclid)
181+
* [manual_retain](https://rust-lang.github.io/rust-clippy/master/index.html#manual_retain)
170182

171183

172184
### cognitive-complexity-threshold
@@ -279,7 +291,7 @@ The minimum size (in bytes) to consider a type for passing by reference instead
279291

280292
**Default Value:** `256` (`u64`)
281293

282-
* [large_type_pass_by_move](https://rust-lang.github.io/rust-clippy/master/index.html#large_type_pass_by_move)
294+
* [large_types_passed_by_value](https://rust-lang.github.io/rust-clippy/master/index.html#large_types_passed_by_value)
283295

284296

285297
### too-many-lines-threshold
@@ -442,6 +454,14 @@ For example, `[_, _, _, e, ..]` is a slice pattern with 4 elements.
442454
* [index_refutable_slice](https://rust-lang.github.io/rust-clippy/master/index.html#index_refutable_slice)
443455

444456

457+
### await-holding-invalid-types
458+
459+
460+
**Default Value:** `[]` (`Vec<crate::utils::conf::DisallowedPath>`)
461+
462+
* [await_holding_invalid_type](https://rust-lang.github.io/rust-clippy/master/index.html#await_holding_invalid_type)
463+
464+
445465
### max-include-file-size
446466
The maximum size of a file included via `include_bytes!()` or `include_str!()`, in bytes
447467

@@ -497,7 +517,7 @@ for the generic parameters for determining interior mutability
497517

498518
**Default Value:** `["bytes::Bytes"]` (`Vec<String>`)
499519

500-
* [mutable_key](https://rust-lang.github.io/rust-clippy/master/index.html#mutable_key)
520+
* [mutable_key_type](https://rust-lang.github.io/rust-clippy/master/index.html#mutable_key_type)
501521

502522

503523
### allow-mixed-uninlined-format-args
@@ -509,7 +529,7 @@ Whether to allow mixed uninlined format args, e.g. `format!("{} {}", a, foo.bar)
509529

510530

511531
### suppress-restriction-lint-in-const
512-
In same
532+
Whether to suppress a restriction lint in constant code. In same
513533
cases the restructured operation might not be unavoidable, as the
514534
suggested counterparts are unavailable in constant code. This
515535
configuration will cause restriction lints to trigger even

src/tools/clippy/clippy_dev/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
aho-corasick = "0.7"
8-
clap = "3.2"
8+
clap = "4.1.4"
99
indoc = "1.0"
1010
itertools = "0.10.1"
1111
opener = "0.5"

0 commit comments

Comments
 (0)