Skip to content

Commit

Permalink
Unrolled build for rust-lang#117520
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#117520 - flip1995:clippyup, r=Manishearth

Clippy subtree update

r? `@Manishearth`
  • Loading branch information
rust-timer authored Nov 3, 2023
2 parents adda05f + 02562bf commit 5a572ec
Show file tree
Hide file tree
Showing 419 changed files with 4,902 additions and 3,578 deletions.
14 changes: 13 additions & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ name = "clippy"
version = "0.1.75"
dependencies = [
"anstream",
"clippy_config",
"clippy_lints",
"clippy_utils",
"color-print",
Expand All @@ -578,6 +579,16 @@ dependencies = [
"walkdir",
]

[[package]]
name = "clippy_config"
version = "0.1.75"
dependencies = [
"rustc-semver",
"serde",
"toml 0.7.5",
"walkdir",
]

[[package]]
name = "clippy_dev"
version = "0.0.1"
Expand All @@ -597,6 +608,7 @@ version = "0.1.75"
dependencies = [
"arrayvec",
"cargo_metadata 0.15.4",
"clippy_config",
"clippy_utils",
"declare_clippy_lint",
"if_chain",
Expand All @@ -621,10 +633,10 @@ name = "clippy_utils"
version = "0.1.75"
dependencies = [
"arrayvec",
"clippy_config",
"if_chain",
"itertools",
"rustc-semver",
"serde",
]

[[package]]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/clippy/.github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
working-directory: clippy_lints

- name: Test clippy_utils
run: cargo test --features deny-warnings,internal
run: cargo test --features deny-warnings
working-directory: clippy_utils

- name: Test rustc_tools_util
Expand Down
6 changes: 5 additions & 1 deletion src/tools/clippy/.github/workflows/clippy_bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,13 @@ jobs:
working-directory: clippy_lints

- name: Test clippy_utils
run: cargo test --features deny-warnings,internal
run: cargo test --features deny-warnings
working-directory: clippy_utils

- name: Test clippy_config
run: cargo test --features deny-warnings
working-directory: clippy_config

- name: Test rustc_tools_util
run: cargo test --features deny-warnings
working-directory: rustc_tools_util
Expand Down
3 changes: 3 additions & 0 deletions src/tools/clippy/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5528,6 +5528,7 @@ Released 2018-09-13
[`unknown_clippy_lints`]: https://rust-lang.github.io/rust-clippy/master/index.html#unknown_clippy_lints
[`unnecessary_box_returns`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_box_returns
[`unnecessary_cast`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_cast
[`unnecessary_fallible_conversions`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_fallible_conversions
[`unnecessary_filter_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_filter_map
[`unnecessary_find_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_find_map
[`unnecessary_fold`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_fold
Expand Down Expand Up @@ -5560,6 +5561,7 @@ Released 2018-09-13
[`unstable_as_slice`]: https://rust-lang.github.io/rust-clippy/master/index.html#unstable_as_slice
[`unused_async`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_async
[`unused_collect`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_collect
[`unused_enumerate_index`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_enumerate_index
[`unused_format_specs`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_format_specs
[`unused_io_amount`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_io_amount
[`unused_label`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_label
Expand Down Expand Up @@ -5589,6 +5591,7 @@ Released 2018-09-13
[`verbose_bit_mask`]: https://rust-lang.github.io/rust-clippy/master/index.html#verbose_bit_mask
[`verbose_file_reads`]: https://rust-lang.github.io/rust-clippy/master/index.html#verbose_file_reads
[`vtable_address_comparisons`]: https://rust-lang.github.io/rust-clippy/master/index.html#vtable_address_comparisons
[`waker_clone_wake`]: https://rust-lang.github.io/rust-clippy/master/index.html#waker_clone_wake
[`while_immutable_condition`]: https://rust-lang.github.io/rust-clippy/master/index.html#while_immutable_condition
[`while_let_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#while_let_loop
[`while_let_on_iterator`]: https://rust-lang.github.io/rust-clippy/master/index.html#while_let_on_iterator
Expand Down
3 changes: 2 additions & 1 deletion src/tools/clippy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ name = "clippy-driver"
path = "src/driver.rs"

[dependencies]
clippy_config = { path = "clippy_config" }
clippy_lints = { path = "clippy_lints" }
rustc_tools_util = "0.3.0"
tempfile = { version = "3.2", optional = true }
termize = "0.1"
color-print = "0.3.4" # Sync version with Cargo
color-print = "0.3.4"
anstream = "0.5.0"

[dev-dependencies]
Expand Down
Loading

0 comments on commit 5a572ec

Please sign in to comment.