Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

redundant_closure_call - add support for shadowed closures

Browse source
This commit is contained in:
Tim Nielens 2020-07-19 11:47:32 +02:00
parent 0fecaf1abc
commit 9603d9652b
3 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clippy_lints/src/redundant_closure_call.rs
View file

@ -11,7 +11,6 @@ use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintCon
use rustc_middle::hir::map::Map;
use rustc_middle::lint::in_external_macro;
use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::symbol::Ident;
declare_clippy_lint! {
/// **What it does:** Detects closures called in the same expression where they
@ -96,9 +95,9 @@ impl EarlyLintPass for RedundantClosureCall {
impl<'tcx> LateLintPass<'tcx> for RedundantClosureCall {
fn check_block(&mut self, cx: &LateContext<'tcx>, block: &'tcx hir::Block<'_>) {
fn count_closure_usage<'tcx>(block: &'tcx hir::Block<'_>, ident: &'tcx Ident) -> usize {
fn count_closure_usage<'tcx>(block: &'tcx hir::Block<'_>, path: &'tcx hir::Path<'tcx>) -> usize {
struct ClosureUsageCount<'tcx> {
ident: &'tcx Ident,
path: &'tcx hir::Path<'tcx>,
count: usize,
};
impl<'tcx> hir_visit::Visitor<'tcx> for ClosureUsageCount<'tcx> {
@ -108,7 +107,8 @@ impl<'tcx> LateLintPass<'tcx> for RedundantClosureCall {
if_chain! {
if let hir::ExprKind::Call(ref closure, _) = expr.kind;
if let hir::ExprKind::Path(hir::QPath::Resolved(_, ref path)) = closure.kind;
if self.ident == &path.segments[0].ident;
if self.path.segments[0].ident == path.segments[0].ident
&& self.path.res == path.res;
then {
self.count += 1;
}
@ -120,7 +120,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantClosureCall {
hir_visit::NestedVisitorMap::None
}
};
let mut closure_usage_count = ClosureUsageCount { ident, count: 0 };
let mut closure_usage_count = ClosureUsageCount { path, count: 0 };
closure_usage_count.visit_block(block);
closure_usage_count.count
}
@ -136,7 +136,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantClosureCall {
if let hir::ExprKind::Call(ref closure, _) = call.kind;
if let hir::ExprKind::Path(hir::QPath::Resolved(_, ref path)) = closure.kind;
if ident == path.segments[0].ident;
if count_closure_usage(block, &ident) == 1;
if count_closure_usage(block, path) == 1;
then {
span_lint(
cx,

15
tests/ui/redundant_closure_call_late.rs
View file

@ -14,9 +14,14 @@ fn main() {
let redun_closure = || 1;
i = redun_closure();
// the lint is applicable here but the lint doesn't support redefinition
let redefined_closure = || 1;
i = redefined_closure();
let redefined_closure = || 2;
i = redefined_closure();
// shadowed closures are supported, lint here
let shadowed_closure = || 1;
i = shadowed_closure();
let shadowed_closure = || 2;
i = shadowed_closure();
// don't lint here
let shadowed_closure = || 2;
i = shadowed_closure();
i = shadowed_closure();
}

14
tests/ui/redundant_closure_call_late.stderr
View file

@ -6,5 +6,17 @@ LL | i = redun_closure();
|
= note: `-D clippy::redundant-closure-call` implied by `-D warnings`
error: aborting due to previous error
error: Closure called just once immediately after it was declared
--> $DIR/redundant_closure_call_late.rs:19:5
|
LL | i = shadowed_closure();
| ^^^^^^^^^^^^^^^^^^^^^^
error: Closure called just once immediately after it was declared
--> $DIR/redundant_closure_call_late.rs:21:5
|
LL | i = shadowed_closure();
| ^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 3 previous errors