mirror/async-std
2
0
Fork 1
mirror of https://github.com/async-rs/async-std.git synced 2025-04-07 00:46:43 +00:00
Code Issues Releases Wiki Activity

polish

Browse source 
Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
This commit is contained in:
Yoshua Wuyts 2019-10-13 21:55:19 +02:00
parent 84a148ddae
commit b601bcfcb8
No known key found for this signature in database
GPG key ID: 24EA8164F96777ED
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stream/stream/merge.rs
View file

@ -3,11 +3,11 @@ use std::task::{Context, Poll};
use futures_core::Stream; use futures_core::Stream;
/// A stream merging two streams. /// A stream that merges two other streams into a single stream.
/// ///
/// This stream is returned by [`Stream::merge`]. /// This stream is returned by [`Stream::merge`].
/// ///
/// [`Stream::merge`]: /// [`Stream::merge`]: trait.Stream.html#method.merge
#[derive(Debug)] #[derive(Debug)]
pub struct Merge<L, R> { pub struct Merge<L, R> {
left: L, left: L,

3
src/stream/stream/mod.rs
View file

@ -34,7 +34,6 @@ mod for_each;
mod fuse; mod fuse;
mod inspect; mod inspect;
mod map; mod map;
mod merge;
mod min_by; mod min_by;
mod next; mod next;
mod nth; mod nth;
@ -88,6 +87,8 @@ cfg_if! {
cfg_if! { cfg_if! {
if #[cfg(any(feature = "unstable", feature = "docs"))] { if #[cfg(any(feature = "unstable", feature = "docs"))] {
mod merge;
use std::pin::Pin; use std::pin::Pin;
use crate::future::Future; use crate::future::Future;