mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

excessive_bools, do not lint in trait impls

Browse Source 
Should not lint because the trait might not be changeable by the user
We only lint in the trait definition
This commit is contained in:
kraktus 2022-10-29 16:12:41 +02:00
parent d9b940e2c3
commit 9e1c7febe2
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clippy_lints/src/excessive_bools.rs
View File

@ -1,5 +1,5 @@
use clippy_utils::diagnostics::span_lint_and_help; use clippy_utils::diagnostics::span_lint_and_help;
use clippy_utils::{has_repr_attr, is_bool}; use clippy_utils::{get_parent_as_impl, has_repr_attr, is_bool};
use rustc_hir::intravisit::FnKind; use rustc_hir::intravisit::FnKind;
use rustc_hir::{Body, FnDecl, HirId, Item, ItemKind, Ty}; use rustc_hir::{Body, FnDecl, HirId, Item, ItemKind, Ty};
use rustc_lint::{LateContext, LateLintPass}; use rustc_lint::{LateContext, LateLintPass};
@ -159,11 +159,16 @@ impl<'tcx> LateLintPass<'tcx> for ExcessiveBools {
fn_decl: &'tcx FnDecl<'tcx>, fn_decl: &'tcx FnDecl<'tcx>,
_: &'tcx Body<'tcx>, _: &'tcx Body<'tcx>,
span: Span, span: Span,
_: HirId, hir_id: HirId,
) { ) {
if let Some(fn_header) = fn_kind.header() if let Some(fn_header) = fn_kind.header()
&& fn_header.abi == Abi::Rust && fn_header.abi == Abi::Rust
&& !span.from_expansion() { && !span.from_expansion()
&& get_parent_as_impl(cx.tcx, hir_id)
.map_or(true,
|impl_item| impl_item.of_trait.is_none()
)
{
self.check_fn_sig(cx, fn_decl, span); self.check_fn_sig(cx, fn_decl, span);
} }
} }

2
tests/ui/fn_params_excessive_bools.rs
View File

@ -35,6 +35,8 @@ impl S {
} }
impl Trait for S { impl Trait for S {
// Should not lint because the trait might not be changeable by the user
// We only lint in the trait definition
fn f(_: bool, _: bool, _: bool, _: bool) {} fn f(_: bool, _: bool, _: bool, _: bool) {}
fn g(_: bool, _: bool, _: bool, _: Vec<u32>) {} fn g(_: bool, _: bool, _: bool, _: Vec<u32>) {}
} }

14
tests/ui/fn_params_excessive_bools.stderr
View File

@ -24,15 +24,7 @@ LL | fn f(&self, _: bool, _: bool, _: bool, _: bool) {}
= help: consider refactoring bools into two-variant enums = help: consider refactoring bools into two-variant enums
error: more than 3 bools in function parameters error: more than 3 bools in function parameters
--> $DIR/fn_params_excessive_bools.rs:38:5 --> $DIR/fn_params_excessive_bools.rs:45:5
|
LL | fn f(_: bool, _: bool, _: bool, _: bool) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: consider refactoring bools into two-variant enums
error: more than 3 bools in function parameters
--> $DIR/fn_params_excessive_bools.rs:43:5
| |
LL | / fn n(_: bool, _: u32, _: bool, _: Box<u32>, _: bool, _: bool) { LL | / fn n(_: bool, _: u32, _: bool, _: Box<u32>, _: bool, _: bool) {
LL | | fn nn(_: bool, _: bool, _: bool, _: bool) {} LL | | fn nn(_: bool, _: bool, _: bool, _: bool) {}
@ -42,12 +34,12 @@ LL | | }
= help: consider refactoring bools into two-variant enums = help: consider refactoring bools into two-variant enums
error: more than 3 bools in function parameters error: more than 3 bools in function parameters
--> $DIR/fn_params_excessive_bools.rs:44:9 --> $DIR/fn_params_excessive_bools.rs:46:9
| |
LL | fn nn(_: bool, _: bool, _: bool, _: bool) {} LL | fn nn(_: bool, _: bool, _: bool, _: bool) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
= help: consider refactoring bools into two-variant enums = help: consider refactoring bools into two-variant enums
error: aborting due to 6 previous errors error: aborting due to 5 previous errors