promote future and stream to top level

Author: pchickey

src/time/future/delay.rs renamed to src/future/delay.rs

@@ -48,24 +48,26 @@
 //! These are unique capabilities provided by WASI 0.2, and because this library
 //! is specific to that are exposed from here.
 
+pub mod future;
 pub mod http;
 pub mod io;
 pub mod iter;
 pub mod net;
 pub mod rand;
 pub mod runtime;
+pub mod stream;
 pub mod time;
 
 pub use wstd_macro::attr_macro_main as main;
 
 pub mod prelude {
+    pub use crate::future::FutureExt as _;
+    pub use crate::future::Timer as _;
     pub use crate::http::Body as _;
     pub use crate::io::AsyncRead as _;
     pub use crate::io::AsyncWrite as _;
-    pub use crate::time::future::FutureExt as _;
-    pub use crate::time::future::Timer as _;
-    pub use crate::time::stream::IntoStream as _;
-    pub use crate::time::stream::StreamExt as _;
+    pub use crate::stream::IntoStream as _;
+    pub use crate::stream::StreamExt as _;
     pub use std::future::IntoFuture as _;
 }
 

src/time/future/future_ext.rs renamed to src/future/future_ext.rs

@@ -112,7 +112,7 @@ mod test {
             let buffer = Duration::from_millis(20);
 
             let mut counter = 0;
-            crate::time::stream::interval(interval)
+            crate::stream::interval(interval)
                 .take(10)
                 .buffer(buffer)
                 .for_each(|buf| counter += buf.len())
@@ -129,7 +129,7 @@ mod test {
             let buffer = Duration::from_millis(10);
 
             let mut counter = 0;
-            crate::time::stream::interval(interval)
+            crate::stream::interval(interval)
                 .take(10)
                 .buffer(buffer)
                 .for_each(|buf| counter += buf.len())

src/time/future/mod.rs renamed to src/future/mod.rs

@@ -5,7 +5,7 @@ use futures_core::ready;
 use futures_core::stream::Stream;
 use pin_project_lite::pin_project;
 
-use crate::time::future::Timer;
+use crate::future::Timer;
 
 pin_project! {
     /// Debounce the stream.
@@ -116,7 +116,7 @@ mod test {
             let debounce = Duration::from_millis(20);
 
             let mut counter = 0;
-            crate::time::stream::interval(interval)
+            crate::stream::interval(interval)
                 .take(10)
                 .debounce(debounce)
                 .for_each(|_| counter += 1)
@@ -133,7 +133,7 @@ mod test {
             let debounce = Duration::from_millis(10);
 
             let mut counter = 0;
-            crate::time::stream::interval(interval)
+            crate::stream::interval(interval)
                 .take(10)
                 .debounce(debounce)
                 .for_each(|_| counter += 1)