Update Clippy #113686

flip1995 · 2023-07-14T11:54:08Z

…would work Also, lint question_mark for `let...else` clauses that can be simplified to use `?`. This lint isn't perfect as it doesn't support the unstable try blocks.

…r=cjgillot Make simd_shuffle_indices use valtrees This removes the second-to-last user of the `destructure_mir_constant` query. So in a follow-up we can remove the query and just move the query provider function directly into pretty printing (which is the last user). cc `@rust-lang/clippy` there's a small functional change, but I think it is correct?

Fix typos Just a couple misc typos I found changelog: none

Use `cargo build --tests` in CI I noticed that we run a `cargo build` but end up downloading/building a bunch of deps after that for tests in CI https://github.com/rust-lang/rust-clippy/actions/runs/5426673277/jobs/9869019973#step:6:12 https://github.com/rust-lang/rust-clippy/actions/runs/5426673277/jobs/9869019973#step:7:11 This builds the tests in the build step too, it may speed up runs by downloading/building more in parallel changelog: none

…llogiq `let_and_return`: lint 'static lifetimes, don't lint borrows in closures Fixes rust-lang#11056 Now also ignores functions returning `'static` lifetimes, since I noticed the `stdin.lock()` example was still being linted but doesn't need to be since rust-lang#93965 changelog: none

Add `SPEEDTEST` In the `master` branch, we currently don't have any way to test the performance of a single lint in changes. This PR adds `SPEEDTEST`, the environment variable which lets you do a speed test on a lint / category of tests with various configuration options. Maybe we should merge this with `lintcheck` 🤔 See the book page for more information. changelog:none

[`missing_fields_in_debug`]: make sure self type is an adt Fixes rust-lang#11063, another ICE that can only happen in core. This lint needs the `DefId` of the implementor to get its fields, but that ICEs if the implementor does not have a `DefId` (as is the case with primitive types, e.g. `impl Debug for bool`), which is where this ICE comes from. This PR changes the check I added in rust-lang#10897 to be more... robust against `Debug` implementations we don't want to lint. Instead of just checking if the self type is a type parameter and "special casing" one specific case we don't want to lint, we should probably rather just check that the self type is either a struct, an enum or a union and only then continue. That prevents weird edge cases like this one that can only happen in core. Again, I don't know if it's even possible to add a test case for this since one cannot implement `Debug` for primitive types outside of the crate that defined `Debug` (core). I did make sure that this PR no longer ICEs on `impl<T> Debug for T` and `impl Debug for bool`. Maybe writing such a test is possible with `#![no_core]` and then re-defining the `Debug` trait or something like that...? changelog: [`missing_fields_in_debug`]: make sure self type is an adt (fixes an ICE in core) r? `@Alexendoo` (reviewed the last PRs for this lint)

new lint: `type_id_on_box` Closes rust-lang#7687. A new lint that detects calling `.type_id()` on `Box<dyn Any>` (and not on the underlying `dyn Any`), which can make up for some pretty confusing bugs! changelog: new lint: [`type_id_on_box`]

If question_mark is allowed, there is no overlap any more, so we can just not suppress it.

Update Clippy r? `@Manishearth`

bors · 2023-07-14T17:32:51Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout clippyup (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self clippyup --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/tools/clippy/clippy_utils/src/ty.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_utils/src/ty.rs
Auto-merging src/tools/clippy/clippy_utils/src/sugg.rs
Auto-merging src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs
Auto-merging src/tools/clippy/clippy_utils/src/lib.rs
Auto-merging src/tools/clippy/clippy_utils/src/eager_or_lazy.rs
Auto-merging src/tools/clippy/clippy_utils/src/consts.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_utils/src/consts.rs
Removing src/tools/clippy/clippy_test_deps/src/lib.rs
Removing src/tools/clippy/clippy_test_deps/Cargo.toml
Auto-merging src/tools/clippy/clippy_lints/src/vec.rs
Auto-merging src/tools/clippy/clippy_lints/src/utils/internal_lints/msrv_attr_impl.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/utils/internal_lints/msrv_attr_impl.rs
Auto-merging src/tools/clippy/clippy_lints/src/useless_conversion.rs
Auto-merging src/tools/clippy/clippy_lints/src/use_self.rs
Auto-merging src/tools/clippy/clippy_lints/src/transmute/transmute_undefined_repr.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/transmute/transmute_undefined_repr.rs
Auto-merging src/tools/clippy/clippy_lints/src/size_of_in_element_count.rs
Auto-merging src/tools/clippy/clippy_lints/src/significant_drop_tightening.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/significant_drop_tightening.rs
Auto-merging src/tools/clippy/clippy_lints/src/returns.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/returns.rs
Auto-merging src/tools/clippy/clippy_lints/src/redundant_slicing.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/redundant_slicing.rs
Auto-merging src/tools/clippy/clippy_lints/src/ptr.rs
Auto-merging src/tools/clippy/clippy_lints/src/pass_by_ref_or_value.rs
Auto-merging src/tools/clippy/clippy_lints/src/non_send_fields_in_send_ty.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/non_send_fields_in_send_ty.rs
Auto-merging src/tools/clippy/clippy_lints/src/non_copy_const.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/non_copy_const.rs
Auto-merging src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/unnecessary_to_owned.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/unnecessary_sort_by.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/methods/unnecessary_sort_by.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/needless_collect.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/mut_mutex_lock.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/mod.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/map_flatten.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/map_collect_result_unit.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/flat_map_option.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/expect_fun_call.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/err_expect.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/case_sensitive_file_extension_comparisons.rs
Auto-merging src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs
Auto-merging src/tools/clippy/clippy_lints/src/matches/match_as_ref.rs
Auto-merging src/tools/clippy/clippy_lints/src/map_unit_fn.rs
Auto-merging src/tools/clippy/clippy_lints/src/loops/missing_spin_loop.rs
Auto-merging src/tools/clippy/clippy_lints/src/let_underscore.rs
Auto-merging src/tools/clippy/clippy_lints/src/len_zero.rs
Auto-merging src/tools/clippy/clippy_lints/src/large_enum_variant.rs
Auto-merging src/tools/clippy/clippy_lints/src/iter_not_returning_iterator.rs
Auto-merging src/tools/clippy/clippy_lints/src/inherent_impl.rs
Auto-merging src/tools/clippy/clippy_lints/src/functions/must_use.rs
Auto-merging src/tools/clippy/clippy_lints/src/from_over_into.rs
Auto-merging src/tools/clippy/clippy_lints/src/derive.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/derive.rs
Auto-merging src/tools/clippy/clippy_lints/src/derivable_impls.rs
Auto-merging src/tools/clippy/clippy_lints/src/dereference.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/dereference.rs
Auto-merging src/tools/clippy/clippy_lints/src/default_numeric_fallback.rs
Auto-merging src/tools/clippy/clippy_lints/src/casts/as_ptr_cast_mut.rs
Auto-merging src/tools/clippy/clippy_lints/src/bool_assert_comparison.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/bool_assert_comparison.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2023-07-14T18:36:53Z

☔ The latest upstream changes (presumably #113591) made this pull request unmergeable. Please resolve the merge conflicts.

Manishearth · 2023-07-14T18:56:17Z

lol

…ednet don't hide lifetimes for `LateContext` Running `cargo dev new_lint --type methods` creates the lint file with hidden lifetimes for the `LateContext` parameter (i.e. `&LateContext`, when it should be `&LateContext<'_>`). This is already warned on with `#![warn(rust_2018_idioms)]`, so clippy should not use hidden lifetimes changelog: none

Remove clippy_test_deps from Cargo.toml

flip1995 · 2023-07-17T08:23:34Z

@rustbot review

Manishearth · 2023-07-17T15:53:28Z

@bors r+

bors · 2023-07-17T15:53:30Z

📌 Commit 8ca13e8 has been approved by Manishearth

It is now in the queue for this repository.

bors · 2023-07-17T18:05:00Z

⌛ Testing commit 8ca13e8 with merge 4eaad89...

bors · 2023-07-17T19:57:28Z

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing 4eaad89 to master...

rust-timer · 2023-07-18T01:29:20Z

Finished benchmarking commit (4eaad89): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.0%	[1.0%, 1.0%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.0%	[1.0%, 1.0%]	1

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	2.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	2.1%	[2.1%, 2.1%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 656.866s -> 657.794s (0.14%)

y21 and others added 30 commits June 18, 2023 22:20

new lint: type_id_on_box

c5a9adc

that was definitely not the right version

9ab1e8e

add it to the methods lint pass

26ac76c

add a few more test cases

b0dfecd

s/is_dyn_trait/is_dyn_any

1b6738b

Make simd_shuffle_indices use valtrees

7bd8ab7

Add SPEEDTEST

d69c4f5

Fix dogfood

0cd8bbc

Finally fix dogfood

57923c3

Use depinfo to discover UI test dependencies

4340a8a

Don't lint manual_let_else in cases where the question mark operator …

86391ab

…would work Also, lint question_mark for `let...else` clauses that can be simplified to use `?`. This lint isn't perfect as it doesn't support the unstable try blocks.

Fix the now stricter lint in manual_rem_euclid.rs

c6be621

Put into one pass

20dfaba

Use cargo build --tests in CI

2f7f139

"try this" -> "try"

420f3d1

Fix typos

885a182

Auto merge of rust-lang#11058 - Centri3:typos, r=xFrednet

1990b72

Fix typos Just a couple misc typos I found changelog: none

Merge commit '37f4c1725d3fd7e9c3ffd8783246bc5589debc53' into clippyup

cb3ecf7

Fix valtree changes

ba1ffec

Fix compile-test tests to work with the new ui_test crate

4aa4fec

let_and_return: lint 'static lifetimes, don't lint borrows in closures

e29a5ac

[missing_fields_in_debug]: make sure self is an adt

555ceb8

Don't suppress manual_let_else if question_mark is allowed

6990eaa

If question_mark is allowed, there is no overlap any more, so we can just not suppress it.

Move pat_and_expr_can_be_question_mark into clippy_utils

d80581c

matthiaskrgr mentioned this pull request Jul 14, 2023

Rollup of 9 pull requests #113700

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 14, 2023

Rollup merge of rust-lang#113686 - flip1995:clippyup, r=Manishearth

43807a2

Update Clippy r? `@Manishearth`

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 14, 2023

y21 and others added 5 commits July 16, 2023 21:37

don't hide lifetimes for LateContext

498db80

Merge commit 'd9c24d1b1ee61f276e550b967409c9f155eac4e3' into clippyup

561303d

Update Cargo.lock/toml

c2490bd

Remove clippy_test_deps from Cargo.toml

Another fix for incorrect_impls

8ca13e8

flip1995 force-pushed the clippyup branch from 8e2fcde to 8ca13e8 Compare July 17, 2023 08:23

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 17, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 17, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 17, 2023

bors merged commit 4eaad89 into rust-lang:master Jul 17, 2023

rustbot added this to the 1.73.0 milestone Jul 17, 2023

This was referenced Jul 17, 2023

Weekly cargo update #112865

Merged

Add internal_features lint #108955

Merged

Rename arg_iter to iter_instantiated #113801

Merged

flip1995 deleted the clippyup branch July 18, 2023 10:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Clippy #113686

Update Clippy #113686

flip1995 commented Jul 14, 2023

bors commented Jul 14, 2023

bors commented Jul 14, 2023

Manishearth commented Jul 14, 2023

flip1995 commented Jul 17, 2023

Manishearth commented Jul 17, 2023

bors commented Jul 17, 2023

bors commented Jul 17, 2023

bors commented Jul 17, 2023

rust-timer commented Jul 18, 2023

Update Clippy #113686

Update Clippy #113686

Conversation

flip1995 commented Jul 14, 2023

bors commented Jul 14, 2023

bors commented Jul 14, 2023

Manishearth commented Jul 14, 2023

flip1995 commented Jul 17, 2023

Manishearth commented Jul 17, 2023

bors commented Jul 17, 2023

bors commented Jul 17, 2023

bors commented Jul 17, 2023

rust-timer commented Jul 18, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size