Skip to content

Commit 71e716a

Browse files
AlexendooAlexendoo
committed
Rename incorrect_impls to non_canonical_impls, move them to warn by default
1 parent 6150bf5 commit 71e716a

24 files changed

+135
-123
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5206,6 +5206,8 @@ Released 2018-09-13
52065206
[`no_effect_underscore_binding`]: https://rust-lang.github.io/rust-clippy/master/index.html#no_effect_underscore_binding
52075207
[`no_mangle_with_rust_abi`]: https://rust-lang.github.io/rust-clippy/master/index.html#no_mangle_with_rust_abi
52085208
[`non_ascii_literal`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_ascii_literal
5209+
[`non_canonical_clone_impl`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_canonical_clone_impl
5210+
[`non_canonical_partial_ord_impl`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_canonical_partial_ord_impl
52095211
[`non_minimal_cfg`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_minimal_cfg
52105212
[`non_octal_unix_permissions`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_octal_unix_permissions
52115213
[`non_send_fields_in_send_ty`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_send_fields_in_send_ty

‎clippy_lints/src/declared_lints.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
211211
crate::implicit_saturating_sub::IMPLICIT_SATURATING_SUB_INFO,
212212
crate::implied_bounds_in_impls::IMPLIED_BOUNDS_IN_IMPLS_INFO,
213213
crate::inconsistent_struct_constructor::INCONSISTENT_STRUCT_CONSTRUCTOR_INFO,
214-
crate::incorrect_impls::INCORRECT_CLONE_IMPL_ON_COPY_TYPE_INFO,
215-
crate::incorrect_impls::INCORRECT_PARTIAL_ORD_IMPL_ON_ORD_TYPE_INFO,
216214
crate::index_refutable_slice::INDEX_REFUTABLE_SLICE_INFO,
217215
crate::indexing_slicing::INDEXING_SLICING_INFO,
218216
crate::indexing_slicing::OUT_OF_BOUNDS_INDEXING_INFO,
@@ -498,6 +496,8 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
498496
crate::no_effect::NO_EFFECT_UNDERSCORE_BINDING_INFO,
499497
crate::no_effect::UNNECESSARY_OPERATION_INFO,
500498
crate::no_mangle_with_rust_abi::NO_MANGLE_WITH_RUST_ABI_INFO,
499+
crate::non_canonical_impls::NON_CANONICAL_CLONE_IMPL_INFO,
500+
crate::non_canonical_impls::NON_CANONICAL_PARTIAL_ORD_IMPL_INFO,
501501
crate::non_copy_const::BORROW_INTERIOR_MUTABLE_CONST_INFO,
502502
crate::non_copy_const::DECLARE_INTERIOR_MUTABLE_CONST_INFO,
503503
crate::non_expressive_names::JUST_UNDERSCORES_AND_DIGITS_INFO,

‎clippy_lints/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ mod implicit_saturating_add;
154154
mod implicit_saturating_sub;
155155
mod implied_bounds_in_impls;
156156
mod inconsistent_struct_constructor;
157-
mod incorrect_impls;
158157
mod index_refutable_slice;
159158
mod indexing_slicing;
160159
mod infinite_iter;
@@ -244,6 +243,7 @@ mod neg_multiply;
244243
mod new_without_default;
245244
mod no_effect;
246245
mod no_mangle_with_rust_abi;
246+
mod non_canonical_impls;
247247
mod non_copy_const;
248248
mod non_expressive_names;
249249
mod non_octal_unix_permissions;
@@ -1070,7 +1070,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
10701070
avoid_breaking_exported_api,
10711071
))
10721072
});
1073-
store.register_late_pass(|_| Box::new(incorrect_impls::IncorrectImpls));
1073+
store.register_late_pass(|_| Box::new(non_canonical_impls::NonCanonicalImpls));
10741074
store.register_late_pass(move |_| {
10751075
Box::new(single_call_fn::SingleCallFn {
10761076
avoid_breaking_exported_api,

‎clippy_lints/src/incorrect_impls.rs renamed to ‎clippy_lints/src/non_canonical_impls.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ declare_clippy_lint! {
1717
/// Checks for manual implementations of `Clone` when `Copy` is already implemented.
1818
///
1919
/// ### Why is this bad?
20-
/// If both `Clone` and `Copy` are implemented, they must agree. This is done by dereferencing
21-
/// `self` in `Clone`'s implementation. Anything else is incorrect.
20+
/// If both `Clone` and `Copy` are implemented, they must agree. This can done by dereferencing
21+
/// `self` in `Clone`'s implementation, which will avoid any possibility of the implementations
22+
/// becoming out of sync.
2223
///
2324
/// ### Example
2425
/// ```rust,ignore
@@ -47,8 +48,8 @@ declare_clippy_lint! {
4748
/// impl Copy for A {}
4849
/// ```
4950
#[clippy::version = "1.72.0"]
50-
pub INCORRECT_CLONE_IMPL_ON_COPY_TYPE,
51-
correctness,
51+
pub NON_CANONICAL_CLONE_IMPL,
52+
suspicious,
5253
"manual implementation of `Clone` on a `Copy` type"
5354
}
5455
declare_clippy_lint! {
@@ -62,11 +63,8 @@ declare_clippy_lint! {
6263
/// introduce an error upon refactoring.
6364
///
6465
/// ### Known issues
65-
/// Code that calls the `.into()` method instead will be flagged as incorrect, despite `.into()`
66-
/// wrapping it in `Some`.
67-
///
68-
/// ### Limitations
69-
/// Will not lint if `Self` and `Rhs` do not have the same type.
66+
/// Code that calls the `.into()` method instead will be flagged, despite `.into()` wrapping it
67+
/// in `Some`.
7068
///
7169
/// ### Example
7270
/// ```rust
@@ -108,13 +106,13 @@ declare_clippy_lint! {
108106
/// }
109107
/// ```
110108
#[clippy::version = "1.72.0"]
111-
pub INCORRECT_PARTIAL_ORD_IMPL_ON_ORD_TYPE,
112-
correctness,
109+
pub NON_CANONICAL_PARTIAL_ORD_IMPL,
110+
suspicious,
113111
"manual implementation of `PartialOrd` when `Ord` is already implemented"
114112
}
115-
declare_lint_pass!(IncorrectImpls => [INCORRECT_CLONE_IMPL_ON_COPY_TYPE, INCORRECT_PARTIAL_ORD_IMPL_ON_ORD_TYPE]);
113+
declare_lint_pass!(NonCanonicalImpls => [NON_CANONICAL_CLONE_IMPL, NON_CANONICAL_PARTIAL_ORD_IMPL]);
116114

117-
impl LateLintPass<'_> for IncorrectImpls {
115+
impl LateLintPass<'_> for NonCanonicalImpls {
118116
#[expect(clippy::too_many_lines)]
119117
fn check_impl_item(&mut self, cx: &LateContext<'_>, impl_item: &ImplItem<'_>) {
120118
let Some(Node::Item(item)) = get_parent_node(cx.tcx, impl_item.hir_id()) else {
@@ -155,7 +153,7 @@ impl LateLintPass<'_> for IncorrectImpls {
155153
{} else {
156154
span_lint_and_sugg(
157155
cx,
158-
INCORRECT_CLONE_IMPL_ON_COPY_TYPE,
156+
NON_CANONICAL_CLONE_IMPL,
159157
block.span,
160158
"incorrect implementation of `clone` on a `Copy` type",
161159
"change this to",
@@ -170,7 +168,7 @@ impl LateLintPass<'_> for IncorrectImpls {
170168
if impl_item.ident.name == sym::clone_from {
171169
span_lint_and_sugg(
172170
cx,
173-
INCORRECT_CLONE_IMPL_ON_COPY_TYPE,
171+
NON_CANONICAL_CLONE_IMPL,
174172
impl_item.span,
175173
"incorrect implementation of `clone_from` on a `Copy` type",
176174
"remove it",
@@ -218,7 +216,7 @@ impl LateLintPass<'_> for IncorrectImpls {
218216

219217
span_lint_and_then(
220218
cx,
221-
INCORRECT_PARTIAL_ORD_IMPL_ON_ORD_TYPE,
219+
NON_CANONICAL_PARTIAL_ORD_IMPL,
222220
item.span,
223221
"incorrect implementation of `partial_cmp` on an `Ord` type",
224222
|diag| {

‎clippy_lints/src/renamed_lints.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
1515
("clippy::eval_order_dependence", "clippy::mixed_read_write_in_expression"),
1616
("clippy::identity_conversion", "clippy::useless_conversion"),
1717
("clippy::if_let_some_result", "clippy::match_result_ok"),
18+
("clippy::incorrect_clone_impl_on_copy_type", "clippy::non_canonical_clone_impl"),
19+
("clippy::incorrect_partial_ord_impl_on_ord_type", "clippy::non_canonical_partial_ord_impl"),
1820
("clippy::integer_arithmetic", "clippy::arithmetic_side_effects"),
1921
("clippy::logic_bug", "clippy::overly_complex_bool_expr"),
2022
("clippy::new_without_default_derive", "clippy::new_without_default"),
@@ -38,12 +40,12 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
3840
("clippy::drop_bounds", "drop_bounds"),
3941
("clippy::drop_copy", "dropping_copy_types"),
4042
("clippy::drop_ref", "dropping_references"),
43+
("clippy::fn_null_check", "useless_ptr_null_checks"),
4144
("clippy::for_loop_over_option", "for_loops_over_fallibles"),
4245
("clippy::for_loop_over_result", "for_loops_over_fallibles"),
4346
("clippy::for_loops_over_fallibles", "for_loops_over_fallibles"),
4447
("clippy::forget_copy", "forgetting_copy_types"),
4548
("clippy::forget_ref", "forgetting_references"),
46-
("clippy::fn_null_check", "useless_ptr_null_checks"),
4749
("clippy::into_iter_on_array", "array_into_iter"),
4850
("clippy::invalid_atomic_ordering", "invalid_atomic_ordering"),
4951
("clippy::invalid_ref", "invalid_value"),

‎tests/ui/bool_comparison.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![allow(clippy::needless_if)]
22
#![warn(clippy::bool_comparison)]
3-
#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
3+
#![allow(clippy::non_canonical_partial_ord_impl)]
44

55
fn main() {
66
let x = true;

‎tests/ui/bool_comparison.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![allow(clippy::needless_if)]
22
#![warn(clippy::bool_comparison)]
3-
#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
3+
#![allow(clippy::non_canonical_partial_ord_impl)]
44

55
fn main() {
66
let x = true;

‎tests/ui/clone_on_copy_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(clippy::incorrect_clone_impl_on_copy_type)]
1+
#![allow(clippy::non_canonical_clone_impl)]
22

33
use std::fmt;
44
use std::marker::PhantomData;

‎tests/ui/derive.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#![allow(
2-
clippy::incorrect_clone_impl_on_copy_type,
3-
clippy::incorrect_partial_ord_impl_on_ord_type,
4-
dead_code
5-
)]
1+
#![allow(clippy::non_canonical_clone_impl, clippy::non_canonical_partial_ord_impl, dead_code)]
62
#![warn(clippy::expl_impl_clone_on_copy)]
73

84
#[derive(Copy)]

‎tests/ui/derive.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: you are implementing `Clone` explicitly on a `Copy` type
2-
--> $DIR/derive.rs:11:1
2+
--> $DIR/derive.rs:7:1
33
|
44
LL | / impl Clone for Qux {
55
LL | |
@@ -10,7 +10,7 @@ LL | | }
1010
| |_^
1111
|
1212
note: consider deriving `Clone` or removing `Copy`
13-
--> $DIR/derive.rs:11:1
13+
--> $DIR/derive.rs:7:1
1414
|
1515
LL | / impl Clone for Qux {
1616
LL | |
@@ -22,7 +22,7 @@ LL | | }
2222
= note: `-D clippy::expl-impl-clone-on-copy` implied by `-D warnings`
2323

2424
error: you are implementing `Clone` explicitly on a `Copy` type
25-
--> $DIR/derive.rs:36:1
25+
--> $DIR/derive.rs:32:1
2626
|
2727
LL | / impl<'a> Clone for Lt<'a> {
2828
LL | |
@@ -33,7 +33,7 @@ LL | | }
3333
| |_^
3434
|
3535
note: consider deriving `Clone` or removing `Copy`
36-
--> $DIR/derive.rs:36:1
36+
--> $DIR/derive.rs:32:1
3737
|
3838
LL | / impl<'a> Clone for Lt<'a> {
3939
LL | |
@@ -44,7 +44,7 @@ LL | | }
4444
| |_^
4545

4646
error: you are implementing `Clone` explicitly on a `Copy` type
47-
--> $DIR/derive.rs:48:1
47+
--> $DIR/derive.rs:44:1
4848
|
4949
LL | / impl Clone for BigArray {
5050
LL | |
@@ -55,7 +55,7 @@ LL | | }
5555
| |_^
5656
|
5757
note: consider deriving `Clone` or removing `Copy`
58-
--> $DIR/derive.rs:48:1
58+
--> $DIR/derive.rs:44:1
5959
|
6060
LL | / impl Clone for BigArray {
6161
LL | |
@@ -66,7 +66,7 @@ LL | | }
6666
| |_^
6767

6868
error: you are implementing `Clone` explicitly on a `Copy` type
69-
--> $DIR/derive.rs:60:1
69+
--> $DIR/derive.rs:56:1
7070
|
7171
LL | / impl Clone for FnPtr {
7272
LL | |
@@ -77,7 +77,7 @@ LL | | }
7777
| |_^
7878
|
7979
note: consider deriving `Clone` or removing `Copy`
80-
--> $DIR/derive.rs:60:1
80+
--> $DIR/derive.rs:56:1
8181
|
8282
LL | / impl Clone for FnPtr {
8383
LL | |
@@ -88,7 +88,7 @@ LL | | }
8888
| |_^
8989

9090
error: you are implementing `Clone` explicitly on a `Copy` type
91-
--> $DIR/derive.rs:81:1
91+
--> $DIR/derive.rs:77:1
9292
|
9393
LL | / impl<T: Clone> Clone for Generic2<T> {
9494
LL | |
@@ -99,7 +99,7 @@ LL | | }
9999
| |_^
100100
|
101101
note: consider deriving `Clone` or removing `Copy`
102-
--> $DIR/derive.rs:81:1
102+
--> $DIR/derive.rs:77:1
103103
|
104104
LL | / impl<T: Clone> Clone for Generic2<T> {
105105
LL | |

‎tests/ui/derive_ord_xor_partial_ord.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![warn(clippy::derive_ord_xor_partial_ord)]
22
#![allow(clippy::unnecessary_wraps)]
3-
#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
3+
#![allow(clippy::non_canonical_partial_ord_impl)]
44

55
use std::cmp::Ordering;
66

‎tests/ui/incorrect_clone_impl_on_copy_type.fixed renamed to ‎tests/ui/non_canonical_clone_impl.fixed

File renamed without changes.

‎tests/ui/incorrect_clone_impl_on_copy_type.rs renamed to ‎tests/ui/non_canonical_clone_impl.rs

File renamed without changes.

‎tests/ui/incorrect_clone_impl_on_copy_type.stderr renamed to ‎tests/ui/non_canonical_clone_impl.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error: incorrect implementation of `clone` on a `Copy` type
2-
--> $DIR/incorrect_clone_impl_on_copy_type.rs:9:29
2+
--> $DIR/non_canonical_clone_impl.rs:9:29
33
|
44
LL | fn clone(&self) -> Self {
55
| _____________________________^
66
LL | | Self(self.0)
77
LL | | }
88
| |_____^ help: change this to: `{ *self }`
99
|
10-
= note: `#[deny(clippy::incorrect_clone_impl_on_copy_type)]` on by default
10+
= note: `-D clippy::non-canonical-clone-impl` implied by `-D warnings`
1111

1212
error: incorrect implementation of `clone_from` on a `Copy` type
13-
--> $DIR/incorrect_clone_impl_on_copy_type.rs:13:5
13+
--> $DIR/non_canonical_clone_impl.rs:13:5
1414
|
1515
LL | / fn clone_from(&mut self, source: &Self) {
1616
LL | | source.clone();
@@ -19,7 +19,7 @@ LL | | }
1919
| |_____^ help: remove it
2020

2121
error: incorrect implementation of `clone` on a `Copy` type
22-
--> $DIR/incorrect_clone_impl_on_copy_type.rs:80:29
22+
--> $DIR/non_canonical_clone_impl.rs:80:29
2323
|
2424
LL | fn clone(&self) -> Self {
2525
| _____________________________^
@@ -28,7 +28,7 @@ LL | | }
2828
| |_____^ help: change this to: `{ *self }`
2929

3030
error: incorrect implementation of `clone_from` on a `Copy` type
31-
--> $DIR/incorrect_clone_impl_on_copy_type.rs:84:5
31+
--> $DIR/non_canonical_clone_impl.rs:84:5
3232
|
3333
LL | / fn clone_from(&mut self, source: &Self) {
3434
LL | | source.clone();

‎tests/ui/incorrect_partial_ord_impl_on_ord_type.fixed renamed to ‎tests/ui/non_canonical_partial_ord_impl.fixed

File renamed without changes.

‎tests/ui/incorrect_partial_ord_impl_on_ord_type.rs renamed to ‎tests/ui/non_canonical_partial_ord_impl.rs

File renamed without changes.

‎tests/ui/incorrect_partial_ord_impl_on_ord_type.stderr renamed to ‎tests/ui/non_canonical_partial_ord_impl.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: incorrect implementation of `partial_cmp` on an `Ord` type
2-
--> $DIR/incorrect_partial_ord_impl_on_ord_type.rs:16:1
2+
--> $DIR/non_canonical_partial_ord_impl.rs:16:1
33
|
44
LL | / impl PartialOrd for A {
55
LL | | fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
@@ -10,10 +10,10 @@ LL | || }
1010
LL | | }
1111
| |__^
1212
|
13-
= note: `#[deny(clippy::incorrect_partial_ord_impl_on_ord_type)]` on by default
13+
= note: `-D clippy::non-canonical-partial-ord-impl` implied by `-D warnings`
1414

1515
error: incorrect implementation of `partial_cmp` on an `Ord` type
16-
--> $DIR/incorrect_partial_ord_impl_on_ord_type.rs:50:1
16+
--> $DIR/non_canonical_partial_ord_impl.rs:50:1
1717
|
1818
LL | / impl PartialOrd for C {
1919
LL | | fn partial_cmp(&self, _: &Self) -> Option<Ordering> {

‎tests/ui/incorrect_partial_ord_impl_on_ord_type_fully_qual.rs renamed to ‎tests/ui/non_canonical_partial_ord_impl_fully_qual.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ impl cmp::Ord for A {
2121
}
2222

2323
impl PartialOrd for A {
24-
//~^ ERROR: incorrect implementation of `partial_cmp` on an `Ord` type
25-
//~| NOTE: `#[deny(clippy::incorrect_partial_ord_impl_on_ord_type)]` on by default
2624
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
2725
// NOTE: This suggestion is wrong, as `Ord` is not in scope. But this should be fine as it isn't
2826
// automatically applied
@@ -46,7 +44,6 @@ impl cmp::Ord for B {
4644
}
4745

4846
impl PartialOrd for B {
49-
//~^ ERROR: incorrect implementation of `partial_cmp` on an `Ord` type
5047
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
5148
// This calls `B.cmp`, not `Ord::cmp`!
5249
Some(self.cmp(other))

‎tests/ui/incorrect_partial_ord_impl_on_ord_type_fully_qual.stderr renamed to ‎tests/ui/non_canonical_partial_ord_impl_fully_qual.stderr

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
error: incorrect implementation of `partial_cmp` on an `Ord` type
2-
--> $DIR/incorrect_partial_ord_impl_on_ord_type_fully_qual.rs:23:1
2+
--> $DIR/non_canonical_partial_ord_impl_fully_qual.rs:23:1
33
|
44
LL | / impl PartialOrd for A {
5-
LL | |
6-
LL | |
75
LL | | fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
86
| | _____________________________________________________________-
97
LL | || // NOTE: This suggestion is wrong, as `Ord` is not in scope. But this should be fine as it isn't
@@ -14,13 +12,12 @@ LL | || }
1412
LL | | }
1513
| |__^
1614
|
17-
= note: `#[deny(clippy::incorrect_partial_ord_impl_on_ord_type)]` on by default
15+
= note: `-D clippy::non-canonical-partial-ord-impl` implied by `-D warnings`
1816

1917
error: incorrect implementation of `partial_cmp` on an `Ord` type
20-
--> $DIR/incorrect_partial_ord_impl_on_ord_type_fully_qual.rs:48:1
18+
--> $DIR/non_canonical_partial_ord_impl_fully_qual.rs:46:1
2119
|
2220
LL | / impl PartialOrd for B {
23-
LL | |
2421
LL | | fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
2522
| | _____________________________________________________________-
2623
LL | || // This calls `B.cmp`, not `Ord::cmp`!

0 commit comments

Comments
 (0)