-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
19 changed files
with
427 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,176 @@ | ||
use crate::utils::{attr_by_name, in_macro, match_path_ast, span_lint_and_help}; | ||
use rustc_lint::{EarlyContext, EarlyLintPass}; | ||
use rustc_session::{declare_tool_lint, impl_lint_pass}; | ||
use rustc_span::Span; | ||
use syntax::ast::{AssocItemKind, Extern, FnSig, Item, ItemKind, Ty, TyKind}; | ||
|
||
use std::convert::TryInto; | ||
|
||
declare_clippy_lint! { | ||
/// **What it does:** Checks for excessive | ||
/// use of bools in structs. | ||
/// | ||
/// **Why is this bad?** Excessive bools in a struct | ||
/// is often a sign that it's used as a state machine, | ||
/// which is much better implemented as an enum. | ||
/// If it's not the case, excessive bools usually benefit | ||
/// from refactoring into two-variant enums for better | ||
/// readability and API. | ||
/// | ||
/// **Known problems:** None. | ||
/// | ||
/// **Example:** | ||
/// Bad: | ||
/// ```rust | ||
/// struct S { | ||
/// is_pending: bool, | ||
/// is_processing: bool, | ||
/// is_finished: bool, | ||
/// } | ||
/// ``` | ||
/// | ||
/// Good: | ||
/// ```rust | ||
/// enum S { | ||
/// Pending, | ||
/// Processing, | ||
/// Finished, | ||
/// } | ||
/// ``` | ||
pub STRUCT_EXCESSIVE_BOOLS, | ||
pedantic, | ||
"using too many bools in a struct" | ||
} | ||
|
||
declare_clippy_lint! { | ||
/// **What it does:** Checks for excessive use of | ||
/// bools in function definitions. | ||
/// | ||
/// **Why is this bad?** Calls to such functions | ||
/// are confusing and error prone, because it's | ||
/// hard to remember argument order and you have | ||
/// no type system support to back you up. Using | ||
/// two-variant enums instead of bools often makes | ||
/// API easier to use. | ||
/// | ||
/// **Known problems:** None. | ||
/// | ||
/// **Example:** | ||
/// Bad: | ||
/// ```rust,ignore | ||
/// fn f(is_round: bool, is_hot: bool) { ... } | ||
/// ``` | ||
/// | ||
/// Good: | ||
/// ```rust,ignore | ||
/// enum Shape { | ||
/// Round, | ||
/// Spiky, | ||
/// } | ||
/// | ||
/// enum Temperature { | ||
/// Hot, | ||
/// IceCold, | ||
/// } | ||
/// | ||
/// fn f(shape: Shape, temperature: Temperature) { ... } | ||
/// ``` | ||
pub FN_PARAMS_EXCESSIVE_BOOLS, | ||
pedantic, | ||
"using too many bools in function parameters" | ||
} | ||
|
||
pub struct ExcessiveBools { | ||
max_struct_bools: u64, | ||
max_fn_params_bools: u64, | ||
} | ||
|
||
impl ExcessiveBools { | ||
#[must_use] | ||
pub fn new(max_struct_bools: u64, max_fn_params_bools: u64) -> Self { | ||
Self { | ||
max_struct_bools, | ||
max_fn_params_bools, | ||
} | ||
} | ||
|
||
fn check_fn_sig(&self, cx: &EarlyContext<'_>, fn_sig: &FnSig, span: Span) { | ||
match fn_sig.header.ext { | ||
Extern::Implicit | Extern::Explicit(_) => return, | ||
Extern::None => (), | ||
} | ||
|
||
if self.max_fn_params_bools | ||
< fn_sig | ||
.decl | ||
.inputs | ||
.iter() | ||
.filter(|param| is_bool_ty(¶m.ty)) | ||
.count() | ||
.try_into() | ||
.unwrap() | ||
{ | ||
span_lint_and_help( | ||
cx, | ||
FN_PARAMS_EXCESSIVE_BOOLS, | ||
span, | ||
&format!("more than {} bools in function parameters", self.max_fn_params_bools), | ||
"consider refactoring bools into two-variant enums", | ||
); | ||
} | ||
} | ||
} | ||
|
||
impl_lint_pass!(ExcessiveBools => [STRUCT_EXCESSIVE_BOOLS, FN_PARAMS_EXCESSIVE_BOOLS]); | ||
|
||
fn is_bool_ty(ty: &Ty) -> bool { | ||
if let TyKind::Path(None, path) = &ty.kind { | ||
return match_path_ast(path, &["bool"]); | ||
} | ||
false | ||
} | ||
|
||
impl EarlyLintPass for ExcessiveBools { | ||
fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) { | ||
if in_macro(item.span) { | ||
return; | ||
} | ||
match &item.kind { | ||
ItemKind::Struct(variant_data, _) => { | ||
if attr_by_name(&item.attrs, "repr").is_some() { | ||
return; | ||
} | ||
|
||
if self.max_struct_bools | ||
< variant_data | ||
.fields() | ||
.iter() | ||
.filter(|field| is_bool_ty(&field.ty)) | ||
.count() | ||
.try_into() | ||
.unwrap() | ||
{ | ||
span_lint_and_help( | ||
cx, | ||
STRUCT_EXCESSIVE_BOOLS, | ||
item.span, | ||
&format!("more than {} bools in a struct", self.max_struct_bools), | ||
"consider using a state machine or refactoring bools into two-variant enums", | ||
); | ||
} | ||
}, | ||
ItemKind::Impl { | ||
of_trait: None, items, .. | ||
} | ||
| ItemKind::Trait(_, _, _, _, items) => { | ||
for item in items { | ||
if let AssocItemKind::Fn(fn_sig, _) = &item.kind { | ||
self.check_fn_sig(cx, fn_sig, item.span); | ||
} | ||
} | ||
}, | ||
ItemKind::Fn(fn_sig, _, _) => self.check_fn_sig(cx, fn_sig, item.span), | ||
_ => (), | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
max-fn-params-bools = 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#![warn(clippy::fn_params_excessive_bools)] | ||
|
||
fn f(_: bool) {} | ||
fn g(_: bool, _: bool) {} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
error: more than 1 bools in function parameters | ||
--> $DIR/test.rs:4:1 | ||
| | ||
LL | fn g(_: bool, _: bool) {} | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | ||
= note: `-D clippy::fn-params-excessive-bools` implied by `-D warnings` | ||
= help: consider refactoring bools into two-variant enums | ||
|
||
error: aborting due to previous error | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
max-struct-bools = 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#![warn(clippy::struct_excessive_bools)] | ||
|
||
struct S { | ||
a: bool, | ||
} | ||
|
||
struct Foo {} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
error: more than 0 bools in a struct | ||
--> $DIR/test.rs:3:1 | ||
| | ||
LL | / struct S { | ||
LL | | a: bool, | ||
LL | | } | ||
| |_^ | ||
| | ||
= note: `-D clippy::struct-excessive-bools` implied by `-D warnings` | ||
= help: consider using a state machine or refactoring bools into two-variant enums | ||
|
||
error: aborting due to previous error | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
error: error reading Clippy's configuration file `$DIR/clippy.toml`: unknown field `foobar`, expected one of `blacklisted-names`, `cognitive-complexity-threshold`, `cyclomatic-complexity-threshold`, `doc-valid-idents`, `too-many-arguments-threshold`, `type-complexity-threshold`, `single-char-binding-names-threshold`, `too-large-for-stack`, `enum-variant-name-threshold`, `enum-variant-size-threshold`, `verbose-bit-mask-threshold`, `literal-representation-threshold`, `trivial-copy-size-limit`, `too-many-lines-threshold`, `array-size-threshold`, `vec-box-size-threshold`, `third-party` at line 5 column 1 | ||
error: error reading Clippy's configuration file `$DIR/clippy.toml`: unknown field `foobar`, expected one of `blacklisted-names`, `cognitive-complexity-threshold`, `cyclomatic-complexity-threshold`, `doc-valid-idents`, `too-many-arguments-threshold`, `type-complexity-threshold`, `single-char-binding-names-threshold`, `too-large-for-stack`, `enum-variant-name-threshold`, `enum-variant-size-threshold`, `verbose-bit-mask-threshold`, `literal-representation-threshold`, `trivial-copy-size-limit`, `too-many-lines-threshold`, `array-size-threshold`, `vec-box-size-threshold`, `max-struct-bools`, `max-fn-params-bools`, `third-party` at line 5 column 1 | ||
|
||
error: aborting due to previous error | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
#![warn(clippy::fn_params_excessive_bools)] | ||
|
||
extern "C" { | ||
fn f(_: bool, _: bool, _: bool, _: bool); | ||
} | ||
|
||
macro_rules! foo { | ||
() => { | ||
fn fff(_: bool, _: bool, _: bool, _: bool) {} | ||
}; | ||
} | ||
|
||
foo!(); | ||
|
||
#[no_mangle] | ||
extern "C" fn k(_: bool, _: bool, _: bool, _: bool) {} | ||
fn g(_: bool, _: bool, _: bool, _: bool) {} | ||
fn h(_: bool, _: bool, _: bool) {} | ||
fn e(_: S, _: S, _: Box<S>, _: Vec<u32>) {} | ||
fn t(_: S, _: S, _: Box<S>, _: Vec<u32>, _: bool, _: bool, _: bool, _: bool) {} | ||
|
||
struct S {} | ||
trait Trait { | ||
fn f(_: bool, _: bool, _: bool, _: bool); | ||
fn g(_: bool, _: bool, _: bool, _: Vec<u32>); | ||
} | ||
|
||
impl S { | ||
fn f(&self, _: bool, _: bool, _: bool, _: bool) {} | ||
fn g(&self, _: bool, _: bool, _: bool) {} | ||
#[no_mangle] | ||
extern "C" fn h(_: bool, _: bool, _: bool, _: bool) {} | ||
} | ||
|
||
impl Trait for S { | ||
fn f(_: bool, _: bool, _: bool, _: bool) {} | ||
fn g(_: bool, _: bool, _: bool, _: Vec<u32>) {} | ||
} | ||
|
||
fn main() { | ||
fn n(_: bool, _: u32, _: bool, _: Box<u32>, _: bool, _: bool) { | ||
fn nn(_: bool, _: bool, _: bool, _: bool) {} | ||
} | ||
} |
Oops, something went wrong.