Skip to content

Commit 9028ce3

Browse files
authored
Rollup merge of #117520 - flip1995:clippyup, r=Manishearth
Clippy subtree update r? `@Manishearth`
2 parents 6cb627b + 02562bf commit 9028ce3

File tree

419 files changed

+4902
-3578
lines changed

Some content is hidden

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

419 files changed

+4902
-3578
lines changed

Cargo.lock

+13-1
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@ name = "clippy"
556556
version = "0.1.75"
557557
dependencies = [
558558
"anstream",
559+
"clippy_config",
559560
"clippy_lints",
560561
"clippy_utils",
561562
"color-print",
@@ -578,6 +579,16 @@ dependencies = [
578579
"walkdir",
579580
]
580581

582+
[[package]]
583+
name = "clippy_config"
584+
version = "0.1.75"
585+
dependencies = [
586+
"rustc-semver",
587+
"serde",
588+
"toml 0.7.5",
589+
"walkdir",
590+
]
591+
581592
[[package]]
582593
name = "clippy_dev"
583594
version = "0.0.1"
@@ -597,6 +608,7 @@ version = "0.1.75"
597608
dependencies = [
598609
"arrayvec",
599610
"cargo_metadata 0.15.4",
611+
"clippy_config",
600612
"clippy_utils",
601613
"declare_clippy_lint",
602614
"if_chain",
@@ -621,10 +633,10 @@ name = "clippy_utils"
621633
version = "0.1.75"
622634
dependencies = [
623635
"arrayvec",
636+
"clippy_config",
624637
"if_chain",
625638
"itertools",
626639
"rustc-semver",
627-
"serde",
628640
]
629641

630642
[[package]]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
working-directory: clippy_lints
6161

6262
- name: Test clippy_utils
63-
run: cargo test --features deny-warnings,internal
63+
run: cargo test --features deny-warnings
6464
working-directory: clippy_utils
6565

6666
- name: Test rustc_tools_util

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,13 @@ jobs:
120120
working-directory: clippy_lints
121121

122122
- name: Test clippy_utils
123-
run: cargo test --features deny-warnings,internal
123+
run: cargo test --features deny-warnings
124124
working-directory: clippy_utils
125125

126+
- name: Test clippy_config
127+
run: cargo test --features deny-warnings
128+
working-directory: clippy_config
129+
126130
- name: Test rustc_tools_util
127131
run: cargo test --features deny-warnings
128132
working-directory: rustc_tools_util

src/tools/clippy/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -5528,6 +5528,7 @@ Released 2018-09-13
55285528
[`unknown_clippy_lints`]: https://rust-lang.github.io/rust-clippy/master/index.html#unknown_clippy_lints
55295529
[`unnecessary_box_returns`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_box_returns
55305530
[`unnecessary_cast`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_cast
5531+
[`unnecessary_fallible_conversions`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_fallible_conversions
55315532
[`unnecessary_filter_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_filter_map
55325533
[`unnecessary_find_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_find_map
55335534
[`unnecessary_fold`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_fold
@@ -5560,6 +5561,7 @@ Released 2018-09-13
55605561
[`unstable_as_slice`]: https://rust-lang.github.io/rust-clippy/master/index.html#unstable_as_slice
55615562
[`unused_async`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_async
55625563
[`unused_collect`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_collect
5564+
[`unused_enumerate_index`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_enumerate_index
55635565
[`unused_format_specs`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_format_specs
55645566
[`unused_io_amount`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_io_amount
55655567
[`unused_label`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_label
@@ -5589,6 +5591,7 @@ Released 2018-09-13
55895591
[`verbose_bit_mask`]: https://rust-lang.github.io/rust-clippy/master/index.html#verbose_bit_mask
55905592
[`verbose_file_reads`]: https://rust-lang.github.io/rust-clippy/master/index.html#verbose_file_reads
55915593
[`vtable_address_comparisons`]: https://rust-lang.github.io/rust-clippy/master/index.html#vtable_address_comparisons
5594+
[`waker_clone_wake`]: https://rust-lang.github.io/rust-clippy/master/index.html#waker_clone_wake
55925595
[`while_immutable_condition`]: https://rust-lang.github.io/rust-clippy/master/index.html#while_immutable_condition
55935596
[`while_let_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#while_let_loop
55945597
[`while_let_on_iterator`]: https://rust-lang.github.io/rust-clippy/master/index.html#while_let_on_iterator

src/tools/clippy/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ name = "clippy-driver"
2121
path = "src/driver.rs"
2222

2323
[dependencies]
24+
clippy_config = { path = "clippy_config" }
2425
clippy_lints = { path = "clippy_lints" }
2526
rustc_tools_util = "0.3.0"
2627
tempfile = { version = "3.2", optional = true }
2728
termize = "0.1"
28-
color-print = "0.3.4" # Sync version with Cargo
29+
color-print = "0.3.4"
2930
anstream = "0.5.0"
3031

3132
[dev-dependencies]

0 commit comments

Comments
 (0)