needless_collect: catch x: Vec<_> = iter.collect(); x.into_iter() ... #5837
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
|
r? @phansch (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
phansch
reviewed
Aug 2, 2020
There was a problem hiding this comment.
how to make the multi-part suggestion include its changes in the source code
Multi-part suggestions are not yet supported by rustfix, so that's not something we could fix here.
Minus the nits, this looks good to me, thanks!
| @@ -0,0 +1,22 @@ | |||
| // run-rustfix | |||
|
|
|||
| #[allow(unused)] | |||
There was a problem hiding this comment.
Did you mean this to be #![allow(unused)]?
clippy_lints/src/loops.rs
Outdated
| let is_empty = sym!(is_empty); | ||
| let contains = sym!(contains); | ||
| match method_name.ident.name { | ||
| name if name == into_iter => self.uses.push( |
There was a problem hiding this comment.
Ah.. function calls are not allowed in patterns. At least for into_iter we can use the pre-interned symbol from rustc (will need a use rustc_span::symbol::sym):
Suggested change
| name if name == into_iter => self.uses.push( | |
| sym::into_iter => self.uses.push( |
clippy_lints/src/loops.rs
Outdated
| if let Some(ref generic_args) = method_name.args; | ||
| if let Some(GenericArg::Type(ref ty)) = generic_args.args.get(0); | ||
| if let ty = cx.typeck_results().node_type(ty.hir_id); | ||
| if is_type_diagnostic_item(cx, ty, sym!(vec_type)) || |
There was a problem hiding this comment.
Suggested change
| if is_type_diagnostic_item(cx, ty, sym!(vec_type)) || | |
| if is_type_diagnostic_item(cx, ty, sym::vec_type) || |
JarredAllen
force-pushed
the
needless_collect
branch
from
f6a1603
to
5e10b03
Compare
JarredAllen
changed the title
|
@phansch I think I've added those suggestions. |
flip1995
added
S-waiting-on-bors
|
@bors r=phansch rollup=always |
|
📌 Commit 5e10b03 has been approved by |
flip1995
added a commit
to flip1995/rust-clippy
that referenced
this pull request
Aug 4, 2020
needless_collect: catch x: Vec<_> = iter.collect(); x.into_iter() ... changelog: Expand the needless_collect lint as suggested in rust-lang#5627 (WIP). This PR is WIP because I can't figure out how to make the multi-part suggestion include its changes in the source code (the fixed is identical to the source, despite the lint making suggestions). Aside from that one issue, I think this should be good.
bors
added a commit
that referenced
this pull request
Aug 4, 2020
Rollup of 6 pull requests Successful merges: - #5725 (should_impl_trait - ignore methods with lifetime params) - #5837 (needless_collect: catch x: Vec<_> = iter.collect(); x.into_iter() ...) - #5846 (Handle mapping to Option in `map_flatten` lint) - #5848 (Add derive_ord_xor_partial_ord lint) - #5852 (Add lint for duplicate methods of trait bounds) - #5856 (Remove old Symbol reexport) Failed merges: r? @ghost changelog: rollup
bors
added a commit
that referenced
this pull request
Aug 4, 2020
Rollup of 6 pull requests Successful merges: - #5725 (should_impl_trait - ignore methods with lifetime params) - #5837 (needless_collect: catch x: Vec<_> = iter.collect(); x.into_iter() ...) - #5846 (Handle mapping to Option in `map_flatten` lint) - #5848 (Add derive_ord_xor_partial_ord lint) - #5852 (Add lint for duplicate methods of trait bounds) - #5856 (Remove old Symbol reexport) Failed merges: r? @ghost changelog: rollup
bors
added a commit
that referenced
this pull request
Aug 4, 2020
Rollup of 5 pull requests Successful merges: - #5837 (needless_collect: catch x: Vec<_> = iter.collect(); x.into_iter() ...) - #5846 (Handle mapping to Option in `map_flatten` lint) - #5848 (Add derive_ord_xor_partial_ord lint) - #5852 (Add lint for duplicate methods of trait bounds) - #5856 (Remove old Symbol reexport) Failed merges: r? @ghost
bors
added a commit
that referenced
this pull request
Aug 4, 2020
Rollup of 5 pull requests Successful merges: - #5837 (needless_collect: catch x: Vec<_> = iter.collect(); x.into_iter() ...) - #5846 (Handle mapping to Option in `map_flatten` lint) - #5848 (Add derive_ord_xor_partial_ord lint) - #5852 (Add lint for duplicate methods of trait bounds) - #5856 (Remove old Symbol reexport) Failed merges: r? @ghost changelog: rollup
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.
changelog: Expand the needless_collect lint as suggested in #5627 (WIP).
This PR is WIP because I can't figure out how to make the multi-part suggestion include its changes in the source code (the fixed is identical to the source, despite the lint making suggestions). Aside from that one issue, I think this should be good.