Merge branch 'add_stream_timeout' of https://github.com/k-nasa/async-std into add_stream_timeout

src/stream/stream/mod.rs

@@ -113,7 +113,7 @@ cfg_if! {
         use crate::stream::FromStream;
 
         pub use merge::Merge;
-        pub use timeout::Timeout;
+        pub use timeout::{TimeoutError, Timeout};
     }
 }