promote task to top level too

Author: pchickey

src/lib.rs

@@ -56,6 +56,7 @@ pub mod net;
 pub mod rand;
 pub mod runtime;
 pub mod stream;
+pub mod task;
 pub mod time;
 
 pub use wstd_macro::attr_macro_main as main;

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

@@ -1,5 +1,6 @@
-use super::{task::Sleep, Instant};
+use super::Instant;
 use crate::stream::{Interval, IntoStream};
+use crate::task::Sleep;
 use std::future::IntoFuture;
 use std::ops::{Add, AddAssign, Sub, SubAssign};
 use wasi::clocks::monotonic_clock;
@@ -138,7 +139,7 @@ impl IntoFuture for Duration {
     type IntoFuture = Sleep;
 
     fn into_future(self) -> Self::IntoFuture {
-        super::task::sleep(self)
+        crate::task::sleep(self)
     }
 }
 

src/time/task/sleep.rs renamed to src/task/sleep.rs

@@ -1,10 +1,9 @@
-use super::task::SleepUntil;
+use super::Duration;
+use crate::task::SleepUntil;
 use std::future::IntoFuture;
 use std::ops::{Add, AddAssign, Sub, SubAssign};
 use wasi::clocks::monotonic_clock;
 
-use super::Duration;
-
 /// A measurement of a monotonically nondecreasing clock. Opaque and useful only
 /// with Duration.
 ///
@@ -78,6 +77,6 @@ impl IntoFuture for Instant {
     type IntoFuture = SleepUntil;
 
     fn into_future(self) -> Self::IntoFuture {
-        super::task::sleep_until(self)
+        crate::task::sleep_until(self)
     }
 }

src/time/task/sleep_until.rs renamed to src/task/sleep_until.rs

@@ -7,8 +7,6 @@ mod instant;
 pub use duration::Duration;
 pub use instant::Instant;
 
-pub mod task;
-
 use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};