squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix FP for redundant_closure_call

Browse source 
Visit the nested things like function body when checking closure call.
This commit is contained in:
Takayuki Nakata 2020-08-18 23:00:21 +09:00
parent 27ae4d303c
commit b2c2266792
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clippy_lints/src/redundant_closure_call.rs
View file

@ -95,12 +95,17 @@ 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<'_>, path: &'tcx hir::Path<'tcx>) -> usize {
struct ClosureUsageCount<'tcx> {
fn count_closure_usage<'a, 'tcx>(
cx: &'a LateContext<'tcx>,
block: &'tcx hir::Block<'_>,
path: &'tcx hir::Path<'tcx>,
) -> usize {
struct ClosureUsageCount<'a, 'tcx> {
cx: &'a LateContext<'tcx>,
path: &'tcx hir::Path<'tcx>,
count: usize,
};
impl<'tcx> hir_visit::Visitor<'tcx> for ClosureUsageCount<'tcx> {
impl<'a, 'tcx> hir_visit::Visitor<'tcx> for ClosureUsageCount<'a, 'tcx> {
type Map = Map<'tcx>;
fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) {
@ -117,10 +122,10 @@ impl<'tcx> LateLintPass<'tcx> for RedundantClosureCall {
}
fn nested_visit_map(&mut self) -> hir_visit::NestedVisitorMap<Self::Map> {
hir_visit::NestedVisitorMap::None
hir_visit::NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
}
};
let mut closure_usage_count = ClosureUsageCount { path, count: 0 };
let mut closure_usage_count = ClosureUsageCount { cx, path, count: 0 };
closure_usage_count.visit_block(block);
closure_usage_count.count
}
@ -136,7 +141,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, path) == 1;
if count_closure_usage(cx, block, path) == 1;
then {
span_lint(
cx,

12
tests/ui/redundant_closure_call_late.rs
View file

@ -24,4 +24,16 @@ fn main() {
let shadowed_closure = || 2;
i = shadowed_closure();
i = shadowed_closure();
// Fix FP in #5916
let mut x;
let create = || 2 * 2;
x = create();
fun(move || {
x = create();
})
}
fn fun<T: 'static + FnMut()>(mut f: T) {
f();
}