Do not trigger redundant_closure for non-function types #4008
Conversation
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
Manishearth
changed the title
Manishearth
reviewed
Apr 19, 2019
clippy_lints/src/eta_reduction.rs
Outdated
| @@ -65,6 +65,9 @@ fn check_closure(cx: &LateContext<'_, '_>, expr: &Expr) { | |||
| if !(is_adjusted(cx, ex) || args.iter().any(|arg| is_adjusted(cx, arg))); | |||
|
|
|||
| let fn_ty = cx.tables.expr_ty(caller); | |||
|
|
|||
| if let ty::FnDef(_, _) = fn_ty.sty; | |||
There was a problem hiding this comment.
This should include FnPtr and Closure.
Use matches! if it works here, otherwise you can move this check below to the then block as a match
phansch
added
the
S-waiting-on-author
|
Does this also fix #1439? (No problem if it doesn't, just making sure) |
|
@phansch The lint does not trigger for the original example (#1439 (comment)). It does trigger for the "minimal repro" (#1439 (comment)) but the suggestion is correct in this case (there is no Box involved, just plain closure) so it seems that the answer is yes. |
|
@bors r+ thanks! |
|
📌 Commit 4f801a2 has been approved by |
bors
added a commit
that referenced
this pull request
Apr 25, 2019
Do not trigger redundant_closure for non-function types fixes #3898 Added a check for the entity being called in the closure body to be a FnDef. This way lint does not trigger for ADTs (Box) but I'm not sure if it's correct and not too restrictive. <!-- Thank you for making Clippy better! We're collecting our changelog from pull request descriptions. If your PR only updates to the latest nightly, you can leave the `changelog` entry as `none`. Otherwise, please write a short comment explaining your change. If your PR fixes an issue, you can add "fixes #issue_number" into this PR description. This way the issue will be automatically closed when your PR is merged. If you added a new lint, here's a checklist for things that will be checked during review or continuous integration. - [ ] Followed [lint naming conventions][lint_naming] - [ ] Added passing UI tests (including committed `.stderr` file) - [ ] `cargo test` passes locally - [ ] Executed `util/dev update_lints` - [ ] Added lint documentation - [ ] Run `cargo fmt` Note that you can skip the above if you are just opening a WIP PR in order to get feedback. Delete this line and everything above before opening your PR --> changelog: Fix false positive in `redundant_closure` pertaining to non-function types
|
☀️ Test successful - checks-travis, status-appveyor |
phansch
added a commit
to phansch/rust-clippy
that referenced
this pull request
Apr 25, 2019
These two cases were fixed by rust-lang#4008. Closes rust-lang#1439 changelog: none
phansch
added a commit
to phansch/rust-clippy
that referenced
this pull request
Apr 26, 2019
These two cases were fixed by rust-lang#4008. Closes rust-lang#1439 changelog: none
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #3898
Added a check for the entity being called in the closure body to be a FnDef. This way lint does not trigger for ADTs (Box) but I'm not sure if it's correct and not too restrictive.
changelog: Fix false positive in
redundant_closurepertaining to non-function types