mirror of
https://github.com/async-rs/async-std.git
synced 2025-04-16 05:16:44 +00:00
Merge branch 'add_stream_timeout' of https://github.com/k-nasa/async-std into add_stream_timeout
This commit is contained in:
commit
b58bd8d725
1 changed files with 6 additions and 6 deletions
|
@ -113,7 +113,7 @@ cfg_if! {
|
|||
use crate::stream::FromStream;
|
||||
|
||||
pub use merge::Merge;
|
||||
pub use timeout::Timeout;
|
||||
pub use timeout::{TimeoutError, Timeout};
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue