[redundant_locals]: take by-value closure captures into account #12227
Conversation
| r? @Manishearth (rustbot has picked a reviewer for you, use r? to override) |
rustbot added the S-waiting-on-review 
| @bors r+ |
[`redundant_locals`]: take by-value closure captures into account Fixes #12225 The same problem in the linked issue can happen to regular closures too, and conveniently async blocks are closures in the HIR so fixing closures will fix async blocks as well. changelog: [`redundant_locals`]: avoid linting when redefined variable is captured by-value
| 💔 Test failed - checks-action_test |
| spurious I wonder if bors lets me retry something that was already approved, probably not |
| @y21: 🔑 Insufficient privileges: not in try users |
clippy_lints/src/redundant_locals.rs Outdated
| if let DefKind::Closure = cx.tcx.def_kind(body) { | ||
| cx.tcx.closure_captures(body).iter().any(|c| { | ||
| matches!(c.info.capture_kind, UpvarCapture::ByValue) | ||
| && matches!(c.place.base, PlaceBase::Upvar(upvar) if upvar.var_path.hir_id == root_variable) | ||
| }) | ||
| } else { | ||
| false | ||
| } |
There was a problem hiding this comment.
This could probably have been simpler:
matches!(cx.tcx.def_kind(body), DefKind::Closure) && cx.tcx.closure_captures(body).iter().any(|c| { matches!(c.info.capture_kind, UpvarCapture::ByValue) && matches!(c.place.base, PlaceBase::Upvar(upvar) if upvar.var_path.hir_id == root_variable) })There was a problem hiding this comment.
good point, i'll change it later today
There was a problem hiding this comment.
Actually ended up using tcx.is_closure_or_coroutine (and added tests for coroutines) since that seems more correct, but the suggestion here to get rid of the if and simplify it to && still applies so thanks :)
| @bors r+ subtle |
| ☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test |
5 participants
Fixes #12225
The same problem in the linked issue can happen to regular closures too, and conveniently async blocks are closures in the HIR so fixing closures will fix async blocks as well.
changelog: [
redundant_locals]: avoid linting when redefined variable is captured by-value