transports/tcp: Update if-watch to v3.0.0
#3101
Conversation
| } | ||
|
|
||
| fn addrs(if_watcher: &Self::IfWatcher) -> Vec<if_watch::IpNet> { | ||
| if_watcher.iter().copied().collect() |
There was a problem hiding this comment.
Returning the iterator would be possible using a HRTB, but given that this is only called in a rare error path I opted for the simpler approach.
| tokio = ["tokio-crate"] | ||
| async-io = ["async-io-crate"] | ||
| tokio = ["dep:tokio", "if-watch/tokio"] | ||
| async-io = ["dep:async-io", "if-watch/smol"] |
There was a problem hiding this comment.
switching to dep:tokio style as was done in other crates — let me know if this one was deliberately left unchanged
Co-authored-by: João Oliveira <[email protected]>
| @@ -46,6 +48,14 @@ pub trait Provider: Clone + Send + 'static { | |||
| type Stream: AsyncRead + AsyncWrite + Send + Unpin + fmt::Debug; | |||
| /// The type of TCP listeners obtained from [`Provider::new_listener`]. | |||
| type Listener: Send + Unpin; | |||
| /// The type of IfWatcher obtained from [`Provider::new_if_watcher`]. | |||
| type IfWatcher: Stream<Item = io::Result<IfEvent>> + Send + Unpin; | |||
There was a problem hiding this comment.
| type IfWatcher: Stream<Item = io::Result<IfEvent>> + Send + Unpin; | |
| type IfWatcher: Stream<Item = io::Result<IfEvent>> + IntoIterator<Item = IpNet> + Send + Unpin; |
Is this legal Rust? My brain compiler is unsure but it could avoid the need for the addrs function I think.
There was a problem hiding this comment.
It is legal syntax, but neither IfWatcher implementation implements this trait, plus into_iter consumes self, so we wouldn’t be able to use this here.
There was a problem hiding this comment.
Ah damn!
The naming of iter suggested that we actually implement the Iterator trait but I guess the consuming nature of IntoIterator makes this unworkable anyway.
Thanks for checking!
thomaseizinger
changed the title
v3.0.0
|
anything still needed from my side to merge this? |
No. For some reason mergify doesn't like this PR. I'll have to look into that. |
|
I also can't update the branch manually. Getting the same error as shown in the mergify check. |
|
@rkuhn Can you push a merge-commit with master manually? |
|
all done :-) |
Description
Update to
if-watchversion 3.0.0 and pass through features, such thatlibp2p-tcp/async-ioselectsif-watch/smolandlibp2p-tcp/tokiobrings inif-watch/tokio.The mDNS part is already done in #3096.
Links to any relevant issues
supersedes #3095
Open Questions
Change checklist
Commit message body
Release 3.0.0 introduces executor-specific features which we now activate accordingly.