fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-05-12 10:57:13 +00:00
Code Issues Projects Releases Wiki Activity

Remove redundant loop (#1176)

Browse Source
This commit is contained in:
Age Manning 2019-06-18 18:42:40 +10:00 committed by Pierre Krieger
parent b6378ac526
commit f6ce1e6b3a
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
core/src/protocols_handler/select.rs
View File

@ -209,41 +209,38 @@ where
} }
fn poll(&mut self) -> Poll<ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent>, Self::Error> { fn poll(&mut self) -> Poll<ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent>, Self::Error> {
loop {
match self.proto1.poll().map_err(EitherError::A)? {
Async::Ready(ProtocolsHandlerEvent::Custom(event)) => {
return Ok(Async::Ready(ProtocolsHandlerEvent::Custom(EitherOutput::First(event))));
},
Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol,
info,
}) => {
return Ok(Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol: protocol.map_upgrade(EitherUpgrade::A),
info: EitherOutput::First(info),
}));
},
Async::NotReady => ()
};
match self.proto2.poll().map_err(EitherError::B)? { match self.proto1.poll().map_err(EitherError::A)? {
Async::Ready(ProtocolsHandlerEvent::Custom(event)) => { Async::Ready(ProtocolsHandlerEvent::Custom(event)) => {
return Ok(Async::Ready(ProtocolsHandlerEvent::Custom(EitherOutput::Second(event)))); return Ok(Async::Ready(ProtocolsHandlerEvent::Custom(EitherOutput::First(event))));
}, },
Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest { Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol, protocol,
info, info,
}) => { }) => {
return Ok(Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest { return Ok(Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol: protocol.map_upgrade(EitherUpgrade::B), protocol: protocol.map_upgrade(EitherUpgrade::A),
info: EitherOutput::Second(info), info: EitherOutput::First(info),
})); }));
}, },
Async::NotReady => () Async::NotReady => ()
}; };
break; match self.proto2.poll().map_err(EitherError::B)? {
} Async::Ready(ProtocolsHandlerEvent::Custom(event)) => {
return Ok(Async::Ready(ProtocolsHandlerEvent::Custom(EitherOutput::Second(event))));
},
Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol,
info,
}) => {
return Ok(Async::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol: protocol.map_upgrade(EitherUpgrade::B),
info: EitherOutput::Second(info),
}));
},
Async::NotReady => ()
};
Ok(Async::NotReady) Ok(Async::NotReady)
} }