Skip to content

Commit 77f4f82

Browse files
borsbors
committed
Auto merge of rust-lang#111799 - flip1995:clippyup, r=Manishearth
Update Clippy r? `@Manishearth`
2 parents 6bacf5a + d780efc commit 77f4f82

File tree

150 files changed

+2632
-1117
lines changed

Some content is hidden

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

150 files changed

+2632
-1117
lines changed

‎Cargo.lock

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ dependencies = [
635635
"itertools",
636636
"pulldown-cmark",
637637
"quine-mc_cluskey",
638-
"regex-syntax",
638+
"regex-syntax 0.7.1",
639639
"rustc-semver",
640640
"semver",
641641
"serde",
@@ -2882,7 +2882,7 @@ checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
28822882
dependencies = [
28832883
"aho-corasick",
28842884
"memchr",
2885-
"regex-syntax",
2885+
"regex-syntax 0.6.26",
28862886
]
28872887

28882888
[[package]]
@@ -2891,7 +2891,7 @@ version = "0.1.10"
28912891
source = "registry+https://github.com/rust-lang/crates.io-index"
28922892
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
28932893
dependencies = [
2894-
"regex-syntax",
2894+
"regex-syntax 0.6.26",
28952895
]
28962896

28972897
[[package]]
@@ -2909,6 +2909,12 @@ version = "0.6.26"
29092909
source = "registry+https://github.com/rust-lang/crates.io-index"
29102910
checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
29112911

2912+
[[package]]
2913+
name = "regex-syntax"
2914+
version = "0.7.1"
2915+
source = "registry+https://github.com/rust-lang/crates.io-index"
2916+
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
2917+
29122918
[[package]]
29132919
name = "remote-test-client"
29142920
version = "0.1.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
github_token: "${{ secrets.github_token }}"
4040

4141
- name: Checkout
42-
uses: actions/checkout@v3.0.2
42+
uses: actions/checkout@v3
4343

4444
- name: Install toolchain
4545
run: rustup show active-toolchain

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
github_token: "${{ secrets.github_token }}"
2828

2929
- name: Checkout
30-
uses: actions/checkout@v3.0.2
30+
uses: actions/checkout@v3
3131
with:
3232
ref: ${{ github.ref }}
3333

@@ -83,7 +83,7 @@ jobs:
8383
github_token: "${{ secrets.github_token }}"
8484

8585
- name: Checkout
86-
uses: actions/checkout@v3.0.2
86+
uses: actions/checkout@v3
8787

8888
- name: Install toolchain
8989
run: rustup show active-toolchain
@@ -149,7 +149,7 @@ jobs:
149149
github_token: "${{ secrets.github_token }}"
150150

151151
- name: Checkout
152-
uses: actions/checkout@v3.0.2
152+
uses: actions/checkout@v3
153153

154154
- name: Install toolchain
155155
run: rustup show active-toolchain
@@ -173,7 +173,7 @@ jobs:
173173
github_token: "${{ secrets.github_token }}"
174174

175175
- name: Checkout
176-
uses: actions/checkout@v3.0.2
176+
uses: actions/checkout@v3
177177

178178
- name: Install toolchain
179179
run: rustup show active-toolchain
@@ -233,7 +233,7 @@ jobs:
233233
github_token: "${{ secrets.github_token }}"
234234

235235
- name: Checkout
236-
uses: actions/checkout@v3.0.2
236+
uses: actions/checkout@v3
237237

238238
- name: Install toolchain
239239
run: rustup show active-toolchain

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
# Setup
2727
- name: Checkout
28-
uses: actions/checkout@v3.0.2
28+
uses: actions/checkout@v3
2929

3030
# Run
3131
- name: Build

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

Lines changed: 2 additions & 2 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@v3.0.2
24+
uses: actions/checkout@v3
2525

2626
- name: Checkout
27-
uses: actions/checkout@v3.0.2
27+
uses: actions/checkout@v3
2828
with:
2929
ref: ${{ env.TARGET_BRANCH }}
3030
path: 'out'

‎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@v3.0.2
19+
uses: actions/checkout@v3
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@v1.4.4
22+
uses: actions/setup-node@v3
2323
with:
2424
node-version: '14.x'
2525

‎src/tools/clippy/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4620,6 +4620,7 @@ Released 2018-09-13
46204620
[`else_if_without_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#else_if_without_else
46214621
[`empty_drop`]: https://rust-lang.github.io/rust-clippy/master/index.html#empty_drop
46224622
[`empty_enum`]: https://rust-lang.github.io/rust-clippy/master/index.html#empty_enum
4623+
[`empty_line_after_doc_comments`]: https://rust-lang.github.io/rust-clippy/master/index.html#empty_line_after_doc_comments
46234624
[`empty_line_after_outer_attr`]: https://rust-lang.github.io/rust-clippy/master/index.html#empty_line_after_outer_attr
46244625
[`empty_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#empty_loop
46254626
[`empty_structs_with_brackets`]: https://rust-lang.github.io/rust-clippy/master/index.html#empty_structs_with_brackets
@@ -4785,6 +4786,7 @@ Released 2018-09-13
47854786
[`manual_main_separator_str`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_main_separator_str
47864787
[`manual_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_map
47874788
[`manual_memcpy`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_memcpy
4789+
[`manual_next_back`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_next_back
47884790
[`manual_non_exhaustive`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_non_exhaustive
47894791
[`manual_ok_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_ok_or
47904792
[`manual_range_contains`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_contains
@@ -4897,6 +4899,7 @@ Released 2018-09-13
48974899
[`no_effect_underscore_binding`]: https://rust-lang.github.io/rust-clippy/master/index.html#no_effect_underscore_binding
48984900
[`no_mangle_with_rust_abi`]: https://rust-lang.github.io/rust-clippy/master/index.html#no_mangle_with_rust_abi
48994901
[`non_ascii_literal`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_ascii_literal
4902+
[`non_minimal_cfg`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_minimal_cfg
49004903
[`non_octal_unix_permissions`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_octal_unix_permissions
49014904
[`non_send_fields_in_send_ty`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_send_fields_in_send_ty
49024905
[`nonminimal_bool`]: https://rust-lang.github.io/rust-clippy/master/index.html#nonminimal_bool
@@ -4978,6 +4981,7 @@ Released 2018-09-13
49784981
[`ref_binding_to_reference`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_binding_to_reference
49794982
[`ref_in_deref`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_in_deref
49804983
[`ref_option_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_option_ref
4984+
[`ref_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_patterns
49814985
[`regex_macro`]: https://rust-lang.github.io/rust-clippy/master/index.html#regex_macro
49824986
[`repeat_once`]: https://rust-lang.github.io/rust-clippy/master/index.html#repeat_once
49834987
[`replace_consts`]: https://rust-lang.github.io/rust-clippy/master/index.html#replace_consts

‎src/tools/clippy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ If you want to contribute to Clippy, you can find more information in [CONTRIBUT
278278

279279
<!-- REUSE-IgnoreStart -->
280280

281-
Copyright 2014-2022 The Rust Project Developers
281+
Copyright 2014-2023 The Rust Project Developers
282282

283283
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
284284
[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)> or the MIT license

‎src/tools/clippy/book/src/development/type_checking.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ in this chapter:
133133
- [Type checking](https://rustc-dev-guide.rust-lang.org/type-checking.html)
134134
- [Ty module](https://rustc-dev-guide.rust-lang.org/ty.html)
135135

136-
[Adt]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/enum.TyKind.html#variant.Adt
136+
[Adt]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_type_ir/sty/enum.TyKind.html#variant.Adt
137137
[AdtDef]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/adt/struct.AdtDef.html
138138
[expr_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TypeckResults.html#method.expr_ty
139139
[node_type]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TypeckResults.html#method.node_type
@@ -142,9 +142,9 @@ in this chapter:
142142
[kind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.Ty.html#method.kind
143143
[LateContext]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/struct.LateContext.html
144144
[LateLintPass]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/trait.LateLintPass.html
145-
[pat_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/context/struct.TypeckResults.html#method.pat_ty
145+
[pat_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/typeck_results/struct.TypeckResults.html#method.pat_ty
146146
[Ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.Ty.html
147-
[TyKind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/enum.TyKind.html
147+
[TyKind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_type_ir/sty/enum.TyKind.html
148148
[TypeckResults]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TypeckResults.html
149149
[middle_ty]: https://doc.rust-lang.org/beta/nightly-rustc/rustc_middle/ty/struct.Ty.html
150150
[hir_ty]: https://doc.rust-lang.org/beta/nightly-rustc/rustc_hir/struct.Ty.html

‎src/tools/clippy/clippy_lints/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if_chain = "1.0"
1717
itertools = "0.10.1"
1818
pulldown-cmark = { version = "0.9", default-features = false }
1919
quine-mc_cluskey = "0.2"
20-
regex-syntax = "0.6"
20+
regex-syntax = "0.7"
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = { version = "1.0", optional = true }
2323
tempfile = { version = "3.2", optional = true }

‎src/tools/clippy/clippy_lints/src/assertions_on_constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl<'tcx> LateLintPass<'tcx> for AssertionsOnConstants {
3838
_ => return,
3939
};
4040
let Some((condition, panic_expn)) = find_assert_args(cx, e, macro_call.expn) else { return };
41-
let Some((Constant::Bool(val), _)) = constant(cx, cx.typeck_results(), condition) else { return };
41+
let Some(Constant::Bool(val)) = constant(cx, cx.typeck_results(), condition) else { return };
4242
if val {
4343
span_lint_and_help(
4444
cx,

0 commit comments

Comments
 (0)