Replace iterator structures with impl Trait.
#48699
Merged
Conversation
This file contains hidden or 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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
frewsxcv
changed the title
impl Trait.impl Trait.
nikomatsakis
requested changes
Mar 6, 2018
| self.edges | ||
| .iter() | ||
| .enumerate() | ||
| .map(|(idx, e)| (EdgeIndex(idx), e)) | ||
| } | ||
|
|
||
| pub fn each_node<'a, F>(&'a self, mut f: F) -> bool |
There was a problem hiding this comment.
This can use impl trait too -- mut f: impl FnMut(NodeIndex, &'a Node<N>) -> bool
| { | ||
| //! Iterates over all edges defined in the graph. | ||
| self.enumerated_nodes().all(|(node_idx, node)| f(node_idx, node)) | ||
| self.enumerated_nodes() | ||
| .all(|(node_idx, node)| f(node_idx, node)) | ||
| } | ||
|
|
||
| pub fn each_edge<'a, F>(&'a self, mut f: F) -> bool |
frewsxcv
force-pushed
the
frewsxcv-impl-trait
branch
from
588f88f to
d8172b0
Compare
|
@nikomatsakis comments have been addressed! |
|
there are travis errors here, I think because we need to remove a now unused type parameter (which was migrated to an |
nikomatsakis
previously requested changes
Mar 7, 2018
| pub fn each_node<'a, F>(&'a self, mut f: F) -> bool | ||
| where F: FnMut(NodeIndex, &'a Node<N>) -> bool | ||
| { | ||
| pub fn each_node<'a, F>(&'a self, mut f: impl FnMut(NodeIndex, &'a Node<N>) -> bool) -> bool { |
| pub fn each_edge<'a, F>(&'a self, mut f: F) -> bool | ||
| where F: FnMut(EdgeIndex, &'a Edge<E>) -> bool | ||
| { | ||
| pub fn each_edge<'a, F>(&'a self, mut f: impl FnMut(EdgeIndex, &'a Edge<E>) -> bool) -> bool { |
frewsxcv
force-pushed
the
frewsxcv-impl-trait
branch
from
d8172b0 to
08a0182
Compare
|
@bors r+ |
|
📌 Commit 08a0182 has been approved by |
bors
added
S-waiting-on-bors
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Mar 8, 2018
…omatsakis Replace iterator structures with `impl Trait`. Two commits: * Replace iterator structures with `impl Trait`. * Run rustfmt on `src/librustc_data_structures/graph/mod.rs`.
bors
added a commit
that referenced
this pull request
Mar 8, 2018
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Two commits:
impl Trait.src/librustc_data_structures/graph/mod.rs.