fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-17 20:11:22 +00:00
Code Issues Projects Releases Wiki Activity

upgrade::or() requires same Output (#218)

Browse Source
This commit is contained in:
Pierre Krieger
2018-05-24 16:37:12 +02:00
committed by GitHub
parent c7f654a815
commit c1cd10c034
7 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/lib.rs
View File

@ -222,9 +222,9 @@ extern crate tokio_io;
pub extern crate multiaddr;
mod connection_reuse;
mod either;
mod peer_id;
pub mod either;
pub mod muxing;
pub mod swarm;
pub mod transport;

21
core/src/upgrade/choice.rs
View File

@ -19,7 +19,6 @@
// DEALINGS IN THE SOFTWARE.
use bytes::Bytes;
use either::EitherOutput;
use futures::prelude::*;
use multiaddr::Multiaddr;
use std::io::Error as IoError;
@ -39,11 +38,11 @@ pub fn or<A, B>(me: A, other: B) -> OrUpgrade<A, B> {
#[derive(Debug, Copy, Clone)]
pub struct OrUpgrade<A, B>(A, B);
impl<C, A, B> ConnectionUpgrade<C> for OrUpgrade<A, B>
impl<C, A, B, O> ConnectionUpgrade<C> for OrUpgrade<A, B>
where
C: AsyncRead + AsyncWrite,
A: ConnectionUpgrade<C>,
B: ConnectionUpgrade<C>,
A: ConnectionUpgrade<C, Output = O>,
B: ConnectionUpgrade<C, Output = O>,
{
type NamesIter = NamesIterChain<A::NamesIter, B::NamesIter>;
type UpgradeIdentifier = EitherUpgradeIdentifier<A::UpgradeIdentifier, B::UpgradeIdentifier>;
@ -56,7 +55,7 @@ where
}
}
type Output = EitherOutput<A::Output, B::Output>;
type Output = O;
type Future = EitherConnUpgrFuture<A::Future, B::Future>;
#[inline]
@ -98,12 +97,12 @@ pub enum EitherConnUpgrFuture<A, B> {
Second(B),
}
impl<A, B> Future for EitherConnUpgrFuture<A, B>
impl<A, B, O> Future for EitherConnUpgrFuture<A, B>
where
A: Future<Error = IoError>,
B: Future<Error = IoError>,
A: Future<Error = IoError, Item = O>,
B: Future<Error = IoError, Item = O>,
{
type Item = EitherOutput<A::Item, B::Item>;
type Item = O;
type Error = IoError;
#[inline]
@ -111,11 +110,11 @@ where
match self {
&mut EitherConnUpgrFuture::First(ref mut a) => {
let item = try_ready!(a.poll());
Ok(Async::Ready(EitherOutput::First(item)))
Ok(Async::Ready(item))
}
&mut EitherConnUpgrFuture::Second(ref mut b) => {
let item = try_ready!(b.poll());
Ok(Async::Ready(EitherOutput::Second(item)))
Ok(Async::Ready(item))
}
}
}