-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Add extra_unused_type_parameters
lint
#10028
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
bors
merged 1 commit into
rust-lang:master
from
mkrasnitski:extra_unused_type_parameters
Feb 3, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,178 @@ | ||
use clippy_utils::diagnostics::span_lint_and_help; | ||
use clippy_utils::trait_ref_of_method; | ||
use rustc_data_structures::fx::FxHashMap; | ||
use rustc_errors::MultiSpan; | ||
use rustc_hir::intravisit::{walk_impl_item, walk_item, walk_param_bound, walk_ty, Visitor}; | ||
use rustc_hir::{ | ||
GenericParamKind, Generics, ImplItem, ImplItemKind, Item, ItemKind, PredicateOrigin, Ty, TyKind, WherePredicate, | ||
}; | ||
use rustc_lint::{LateContext, LateLintPass}; | ||
use rustc_middle::hir::nested_filter; | ||
use rustc_session::{declare_lint_pass, declare_tool_lint}; | ||
use rustc_span::{def_id::DefId, Span}; | ||
|
||
declare_clippy_lint! { | ||
/// ### What it does | ||
/// Checks for type parameters in generics that are never used anywhere else. | ||
/// | ||
/// ### Why is this bad? | ||
/// Functions cannot infer the value of unused type parameters; therefore, calling them | ||
/// requires using a turbofish, which serves no purpose but to satisfy the compiler. | ||
/// | ||
/// ### Example | ||
/// ```rust | ||
/// // unused type parameters | ||
/// fn unused_ty<T>(x: u8) { | ||
/// // .. | ||
/// } | ||
/// ``` | ||
/// Use instead: | ||
/// ```rust | ||
/// fn no_unused_ty(x: u8) { | ||
/// // .. | ||
/// } | ||
/// ``` | ||
#[clippy::version = "1.69.0"] | ||
pub EXTRA_UNUSED_TYPE_PARAMETERS, | ||
complexity, | ||
"unused type parameters in function definitions" | ||
} | ||
declare_lint_pass!(ExtraUnusedTypeParameters => [EXTRA_UNUSED_TYPE_PARAMETERS]); | ||
|
||
/// A visitor struct that walks a given function and gathers generic type parameters, plus any | ||
/// trait bounds those parameters have. | ||
struct TypeWalker<'cx, 'tcx> { | ||
cx: &'cx LateContext<'tcx>, | ||
/// Collection of all the type parameters and their spans. | ||
ty_params: FxHashMap<DefId, Span>, | ||
/// Collection of any (inline) trait bounds corresponding to each type parameter. | ||
bounds: FxHashMap<DefId, Span>, | ||
/// The entire `Generics` object of the function, useful for querying purposes. | ||
generics: &'tcx Generics<'tcx>, | ||
/// The value of this will remain `true` if *every* parameter: | ||
/// 1. Is a type parameter, and | ||
/// 2. Goes unused in the function. | ||
/// Otherwise, if any type parameters end up being used, or if any lifetime or const-generic | ||
/// parameters are present, this will be set to `false`. | ||
all_params_unused: bool, | ||
} | ||
|
||
impl<'cx, 'tcx> TypeWalker<'cx, 'tcx> { | ||
fn new(cx: &'cx LateContext<'tcx>, generics: &'tcx Generics<'tcx>) -> Self { | ||
let mut all_params_unused = true; | ||
let ty_params = generics | ||
.params | ||
.iter() | ||
.filter_map(|param| { | ||
if let GenericParamKind::Type { .. } = param.kind { | ||
Some((param.def_id.into(), param.span)) | ||
} else { | ||
if !param.is_elided_lifetime() { | ||
all_params_unused = false; | ||
} | ||
None | ||
} | ||
}) | ||
.collect(); | ||
Self { | ||
cx, | ||
ty_params, | ||
bounds: FxHashMap::default(), | ||
generics, | ||
all_params_unused, | ||
} | ||
} | ||
|
||
fn emit_lint(&self) { | ||
let (msg, help) = match self.ty_params.len() { | ||
0 => return, | ||
1 => ( | ||
"type parameter goes unused in function definition", | ||
"consider removing the parameter", | ||
), | ||
_ => ( | ||
"type parameters go unused in function definition", | ||
"consider removing the parameters", | ||
), | ||
}; | ||
|
||
let source_map = self.cx.tcx.sess.source_map(); | ||
let span = if self.all_params_unused { | ||
self.generics.span.into() // Remove the entire list of generics | ||
} else { | ||
MultiSpan::from_spans( | ||
self.ty_params | ||
.iter() | ||
.map(|(def_id, &span)| { | ||
// Extend the span past any trait bounds, and include the comma at the end. | ||
let span_to_extend = self.bounds.get(def_id).copied().map_or(span, Span::shrink_to_hi); | ||
let comma_range = source_map.span_extend_to_next_char(span_to_extend, '>', false); | ||
let comma_span = source_map.span_through_char(comma_range, ','); | ||
span.with_hi(comma_span.hi()) | ||
mkrasnitski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}) | ||
.collect(), | ||
) | ||
}; | ||
|
||
span_lint_and_help(self.cx, EXTRA_UNUSED_TYPE_PARAMETERS, span, msg, None, help); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You've put so much effort in crafting this awesome spans and message, I think this should be |
||
} | ||
} | ||
|
||
impl<'cx, 'tcx> Visitor<'tcx> for TypeWalker<'cx, 'tcx> { | ||
type NestedFilter = nested_filter::OnlyBodies; | ||
|
||
fn visit_ty(&mut self, t: &'tcx Ty<'tcx>) { | ||
if let Some((def_id, _)) = t.peel_refs().as_generic_param() { | ||
if self.ty_params.remove(&def_id).is_some() { | ||
self.all_params_unused = false; | ||
} | ||
} else if let TyKind::OpaqueDef(id, _, _) = t.kind { | ||
// Explicitly walk OpaqueDef. Normally `walk_ty` would do the job, but it calls | ||
// `visit_nested_item`, which checks that `Self::NestedFilter::INTER` is set. We're | ||
// using `OnlyBodies`, so the check ends up failing and the type isn't fully walked. | ||
let item = self.nested_visit_map().item(id); | ||
walk_item(self, item); | ||
} else { | ||
walk_ty(self, t); | ||
} | ||
} | ||
|
||
fn visit_where_predicate(&mut self, predicate: &'tcx WherePredicate<'tcx>) { | ||
if let WherePredicate::BoundPredicate(predicate) = predicate { | ||
// Collect spans for bounds that appear in the list of generics (not in a where-clause) | ||
// for use in forming the help message | ||
if let Some((def_id, _)) = predicate.bounded_ty.peel_refs().as_generic_param() | ||
&& let PredicateOrigin::GenericParam = predicate.origin | ||
{ | ||
self.bounds.insert(def_id, predicate.span); | ||
} | ||
// Only walk the right-hand side of where-bounds | ||
for bound in predicate.bounds { | ||
walk_param_bound(self, bound); | ||
} | ||
} | ||
} | ||
|
||
fn nested_visit_map(&mut self) -> Self::Map { | ||
self.cx.tcx.hir() | ||
} | ||
} | ||
|
||
impl<'tcx> LateLintPass<'tcx> for ExtraUnusedTypeParameters { | ||
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'tcx>) { | ||
if let ItemKind::Fn(_, generics, _) = item.kind { | ||
let mut walker = TypeWalker::new(cx, generics); | ||
walk_item(&mut walker, item); | ||
walker.emit_lint(); | ||
} | ||
} | ||
|
||
fn check_impl_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx ImplItem<'tcx>) { | ||
// Only lint on inherent methods, not trait methods. | ||
if let ImplItemKind::Fn(..) = item.kind && trait_ref_of_method(cx, item.owner_id.def_id).is_none() { | ||
let mut walker = TypeWalker::new(cx, item.generics); | ||
walk_impl_item(&mut walker, item); | ||
walker.emit_lint(); | ||
} | ||
} | ||
} |
This file contains hidden or 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 hidden or 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,69 @@ | ||
#![allow(unused, clippy::needless_lifetimes)] | ||
#![warn(clippy::extra_unused_type_parameters)] | ||
|
||
fn unused_ty<T>(x: u8) {} | ||
|
||
fn unused_multi<T, U>(x: u8) {} | ||
|
||
fn unused_with_lt<'a, T>(x: &'a u8) {} | ||
|
||
fn used_ty<T>(x: T, y: u8) {} | ||
|
||
fn used_ref<'a, T>(x: &'a T) {} | ||
|
||
fn used_ret<T: Default>(x: u8) -> T { | ||
T::default() | ||
} | ||
|
||
fn unused_bounded<T: Default, U>(x: U) {} | ||
|
||
fn unused_where_clause<T, U>(x: U) | ||
where | ||
T: Default, | ||
{ | ||
} | ||
|
||
fn some_unused<A, B, C, D: Iterator<Item = (B, C)>, E>(b: B, c: C) {} | ||
|
||
fn used_opaque<A>(iter: impl Iterator<Item = A>) -> usize { | ||
iter.count() | ||
} | ||
|
||
fn used_ret_opaque<A>() -> impl Iterator<Item = A> { | ||
std::iter::empty() | ||
} | ||
|
||
fn used_vec_box<T>(x: Vec<Box<T>>) {} | ||
|
||
fn used_body<T: Default + ToString>() -> String { | ||
T::default().to_string() | ||
} | ||
|
||
fn used_closure<T: Default + ToString>() -> impl Fn() { | ||
|| println!("{}", T::default().to_string()) | ||
} | ||
|
||
struct S; | ||
|
||
impl S { | ||
fn unused_ty_impl<T>(&self) {} | ||
} | ||
|
||
// Don't lint on trait methods | ||
trait Foo { | ||
fn bar<T>(&self); | ||
} | ||
|
||
impl Foo for S { | ||
fn bar<T>(&self) {} | ||
} | ||
|
||
fn skip_index<A, Iter>(iter: Iter, index: usize) -> impl Iterator<Item = A> | ||
where | ||
Iter: Iterator<Item = A>, | ||
{ | ||
iter.enumerate() | ||
.filter_map(move |(i, a)| if i == index { None } else { Some(a) }) | ||
} | ||
|
||
fn main() {} |
This file contains hidden or 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,59 @@ | ||
error: type parameter goes unused in function definition | ||
--> $DIR/extra_unused_type_parameters.rs:4:13 | ||
| | ||
LL | fn unused_ty<T>(x: u8) {} | ||
| ^^^ | ||
| | ||
= help: consider removing the parameter | ||
= note: `-D clippy::extra-unused-type-parameters` implied by `-D warnings` | ||
|
||
error: type parameters go unused in function definition | ||
--> $DIR/extra_unused_type_parameters.rs:6:16 | ||
| | ||
LL | fn unused_multi<T, U>(x: u8) {} | ||
| ^^^^^^ | ||
| | ||
= help: consider removing the parameters | ||
|
||
error: type parameter goes unused in function definition | ||
--> $DIR/extra_unused_type_parameters.rs:8:23 | ||
| | ||
LL | fn unused_with_lt<'a, T>(x: &'a u8) {} | ||
| ^ | ||
| | ||
= help: consider removing the parameter | ||
|
||
error: type parameter goes unused in function definition | ||
--> $DIR/extra_unused_type_parameters.rs:18:19 | ||
| | ||
LL | fn unused_bounded<T: Default, U>(x: U) {} | ||
| ^^^^^^^^^^^ | ||
| | ||
= help: consider removing the parameter | ||
|
||
error: type parameter goes unused in function definition | ||
--> $DIR/extra_unused_type_parameters.rs:20:24 | ||
| | ||
LL | fn unused_where_clause<T, U>(x: U) | ||
| ^^ | ||
| | ||
= help: consider removing the parameter | ||
|
||
error: type parameters go unused in function definition | ||
--> $DIR/extra_unused_type_parameters.rs:26:16 | ||
| | ||
LL | fn some_unused<A, B, C, D: Iterator<Item = (B, C)>, E>(b: B, c: C) {} | ||
| ^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^ | ||
| | ||
= help: consider removing the parameters | ||
|
||
error: type parameter goes unused in function definition | ||
--> $DIR/extra_unused_type_parameters.rs:49:22 | ||
| | ||
LL | fn unused_ty_impl<T>(&self) {} | ||
| ^^^ | ||
| | ||
= help: consider removing the parameter | ||
|
||
error: aborting due to 7 previous errors | ||
|
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.