-
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.
add a new lint, pub_underscore_fields
- add a new late pass lint - add ui tests - update CHANGELOG.md
- Loading branch information
Showing
6 changed files
with
196 additions
and
0 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
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,82 @@ | ||
use clippy_utils::attrs::is_doc_hidden; | ||
use clippy_utils::diagnostics::span_lint_and_help; | ||
use clippy_utils::is_path_lang_item; | ||
use rustc_hir::{FieldDef, Item, ItemKind, LangItem}; | ||
use rustc_lint::{LateContext, LateLintPass}; | ||
use rustc_middle::ty::Visibility; | ||
use rustc_session::{declare_lint_pass, declare_tool_lint}; | ||
|
||
declare_clippy_lint! { | ||
/// ### What it does | ||
/// Checks whether any field of the struct is prefixed with an `_` (underscore) and also marked | ||
/// `pub` (public) | ||
/// | ||
/// ### Why is this bad? | ||
/// Fields prefixed with an `_` are inferred as unused, which suggests it should not be marked | ||
/// as `pub`, because marking it as `pub` infers it will be used. | ||
/// | ||
/// ### Example | ||
/// ```rust | ||
/// struct FileHandle { | ||
/// pub _descriptor: usize, | ||
/// } | ||
/// ``` | ||
/// Use instead: | ||
/// ```rust | ||
/// struct FileHandle { | ||
/// _descriptor: usize, | ||
/// } | ||
/// ``` | ||
/// | ||
/// // OR | ||
/// | ||
/// ```rust | ||
/// struct FileHandle { | ||
/// pub descriptor: usize, | ||
/// } | ||
/// ``` | ||
#[clippy::version = "1.75.0"] | ||
pub PUB_UNDERSCORE_FIELDS, | ||
pedantic, | ||
"struct field prefixed with underscore and marked public" | ||
} | ||
declare_lint_pass!(PubUnderscoreFields => [PUB_UNDERSCORE_FIELDS]); | ||
|
||
impl<'tcx> LateLintPass<'tcx> for PubUnderscoreFields { | ||
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) { | ||
// This lint only pertains to structs. | ||
let ItemKind::Struct(variant_data, _) = &item.kind else { | ||
return; | ||
}; | ||
|
||
let is_visible = |field: &FieldDef<'_>| { | ||
let parent = cx.tcx.parent_module_from_def_id(field.def_id); | ||
let grandparent = cx.tcx.parent_module_from_def_id(parent.into()); | ||
let visibility = cx.tcx.visibility(field.def_id); | ||
|
||
let case_1 = parent == grandparent && !field.vis_span.is_empty(); | ||
let case_2 = visibility != Visibility::Restricted(parent.to_def_id()); | ||
|
||
case_1 || case_2 | ||
}; | ||
|
||
for field in variant_data.fields() { | ||
// Only pertains to fields that start with an underscore, and are public. | ||
if field.ident.as_str().starts_with('_') && is_visible(field) | ||
// We ignore fields that have `#[doc(hidden)]`. | ||
&& !is_doc_hidden(cx.tcx.hir().attrs(field.hir_id)) | ||
// We ignore fields that are `PhantomData`. | ||
&& !is_path_lang_item(cx, field.ty, LangItem::PhantomData) | ||
{ | ||
span_lint_and_help( | ||
cx, | ||
PUB_UNDERSCORE_FIELDS, | ||
field.vis_span.to(field.ident.span), | ||
"field marked as public but also inferred as unused because it's prefixed with `_`", | ||
None, | ||
"consider removing the underscore, or making the field private", | ||
); | ||
} | ||
} | ||
} | ||
} |
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,58 @@ | ||
#![allow(unused)] | ||
#![warn(clippy::pub_underscore_fields)] | ||
|
||
use std::marker::PhantomData; | ||
|
||
mod inner { | ||
use std::marker; | ||
|
||
pub struct PubSuper { | ||
pub(super) a: usize, | ||
pub(super) _b: u8, | ||
_c: i32, | ||
pub _mark: marker::PhantomData<u8>, | ||
} | ||
|
||
mod inner2 { | ||
pub struct PubModVisibility { | ||
pub(in crate::inner) e: bool, | ||
pub(in crate::inner) _f: Option<()>, | ||
} | ||
} | ||
} | ||
|
||
fn main() { | ||
pub struct StructWithOneViolation { | ||
pub _a: usize, | ||
} | ||
|
||
// should handle structs with multiple violations | ||
pub struct StructWithMultipleViolations { | ||
a: u8, | ||
_b: usize, | ||
pub _c: i64, | ||
#[doc(hidden)] | ||
pub d: String, | ||
pub _e: Option<u8>, | ||
} | ||
|
||
// shouldn't warn on anonymous fields | ||
pub struct AnonymousFields(pub usize, i32); | ||
|
||
// don't warn on empty structs | ||
pub struct Empty1; | ||
pub struct Empty2(); | ||
pub struct Empty3 {}; | ||
|
||
pub struct PubCrate { | ||
pub(crate) a: String, | ||
pub(crate) _b: Option<String>, | ||
} | ||
|
||
// shouldn't warn on fields named pub | ||
pub struct NamedPub { | ||
r#pub: bool, | ||
_pub: String, | ||
pub(crate) _mark: PhantomData<u8>, | ||
} | ||
} |
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,52 @@ | ||
error: field marked as public but also inferred as unused because it's prefixed with `_` | ||
--> $DIR/pub_underscore_fields.rs:11:9 | ||
| | ||
LL | pub(super) _b: u8, | ||
| ^^^^^^^^^^^^^ | ||
| | ||
= help: consider removing the underscore, or making the field private | ||
= note: `-D clippy::pub-underscore-fields` implied by `-D warnings` | ||
= help: to override `-D warnings` add `#[allow(clippy::pub_underscore_fields)]` | ||
|
||
error: field marked as public but also inferred as unused because it's prefixed with `_` | ||
--> $DIR/pub_underscore_fields.rs:19:13 | ||
| | ||
LL | pub(in crate::inner) _f: Option<()>, | ||
| ^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | ||
= help: consider removing the underscore, or making the field private | ||
|
||
error: field marked as public but also inferred as unused because it's prefixed with `_` | ||
--> $DIR/pub_underscore_fields.rs:26:9 | ||
| | ||
LL | pub _a: usize, | ||
| ^^^^^^ | ||
| | ||
= help: consider removing the underscore, or making the field private | ||
|
||
error: field marked as public but also inferred as unused because it's prefixed with `_` | ||
--> $DIR/pub_underscore_fields.rs:33:9 | ||
| | ||
LL | pub _c: i64, | ||
| ^^^^^^ | ||
| | ||
= help: consider removing the underscore, or making the field private | ||
|
||
error: field marked as public but also inferred as unused because it's prefixed with `_` | ||
--> $DIR/pub_underscore_fields.rs:36:9 | ||
| | ||
LL | pub _e: Option<u8>, | ||
| ^^^^^^ | ||
| | ||
= help: consider removing the underscore, or making the field private | ||
|
||
error: field marked as public but also inferred as unused because it's prefixed with `_` | ||
--> $DIR/pub_underscore_fields.rs:49:9 | ||
| | ||
LL | pub(crate) _b: Option<String>, | ||
| ^^^^^^^^^^^^^ | ||
| | ||
= help: consider removing the underscore, or making the field private | ||
|
||
error: aborting due to 6 previous errors | ||
|