mirror of
https://github.com/async-rs/async-std.git
synced 2025-04-10 18:36:43 +00:00
Fuse next() future
This commit is contained in:
parent
d55cfb1da8
commit
17534cfffc
2 changed files with 6 additions and 12 deletions
|
@ -94,11 +94,11 @@ async fn client_writer(
|
|||
let mut shutdown = shutdown.fuse();
|
||||
loop { // 2
|
||||
select! {
|
||||
msg = messages.next() => match msg {
|
||||
msg = messages.next().fuse() => match msg {
|
||||
Some(msg) => stream.write_all(msg.as_bytes()).await?,
|
||||
None => break,
|
||||
},
|
||||
void = shutdown.next() => match void {
|
||||
void = shutdown.next().fuse() => match void {
|
||||
Some(void) => match void {}, // 3
|
||||
None => break,
|
||||
}
|
||||
|
@ -210,11 +210,11 @@ async fn client_writer(
|
|||
let mut shutdown = shutdown.fuse();
|
||||
loop {
|
||||
select! {
|
||||
msg = messages.next() => match msg {
|
||||
msg = messages.next().fuse() => match msg {
|
||||
Some(msg) => stream.write_all(msg.as_bytes()).await?,
|
||||
None => break,
|
||||
},
|
||||
void = shutdown.next() => match void {
|
||||
void = shutdown.next().fuse() => match void {
|
||||
Some(void) => match void {},
|
||||
None => break,
|
||||
}
|
||||
|
@ -244,11 +244,11 @@ async fn broker(events: Receiver<Event>) {
|
|||
let mut events = events.fuse();
|
||||
loop {
|
||||
let event = select! {
|
||||
event = events.next() => match event {
|
||||
event = events.next().fuse() => match event {
|
||||
None => break, // 2
|
||||
Some(event) => event,
|
||||
},
|
||||
disconnect = disconnect_receiver.next() => {
|
||||
disconnect = disconnect_receiver.next().fuse() => {
|
||||
let (name, _pending_messages) = disconnect.unwrap(); // 3
|
||||
assert!(peers.remove(&name).is_some());
|
||||
continue;
|
||||
|
|
|
@ -31,9 +31,3 @@ impl<S: futures_core::Stream> futures_core::Stream for Fuse<S> {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<S: futures_core::Stream> futures_core::stream::FusedStream for Fuse<S> {
|
||||
fn is_terminated(&self) -> bool {
|
||||
self.done
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue