Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add impl IntoIterator for MultiHandler to get access to inners #2572

Merged
merged 4 commits into from Mar 21, 2022
Merged

Add impl IntoIterator for MultiHandler to get access to inners #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7523097
Add impl IntoIterator for MultiHandler to get access to inners
kpp Mar 18, 2022
d52f2b0
Review fixes
kpp Mar 21, 2022
ece2034
Add changelog
kpp Mar 21, 2022
b87036b
Merge branch 'master' into multihandler_intoiter
kpp Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions swarm/CHANGELOG.md
View file
Open in desktop
@@ -1,7 +1,9 @@
# 0.35.0 [unreleased]

- Add impl `IntoIterator` for `MultiHandler`. See [PR 2572].
- Remove `Send` bound from `NetworkBehaviour`. See [PR 2535].

[PR 2572]: https://github.com/libp2p/rust-libp2p/pull/2572/
[PR 2535]: https://github.com/libp2p/rust-libp2p/pull/2535/

# 0.34.0 [2022-02-22]
Expand Down
10 changes: 10 additions & 0 deletions swarm/src/handler/multi.rs
View file
Open in desktop
Expand Up @@ -319,6 +319,16 @@ where
}
}

/// Split [`MultiHandler`] into parts.
impl<K, H> IntoIterator for MultiHandler<K, H> {
type Item = <Self::IntoIter as Iterator>::Item;
type IntoIter = std::collections::hash_map::IntoIter<K, H>;

fn into_iter(self) -> Self::IntoIter {
self.handlers.into_iter()
}
}

/// A [`IntoConnectionHandler`] for multiple other `IntoConnectionHandler`s.
#[derive(Clone)]
pub struct IntoMultiHandler<K, H> {
Expand Down