diff options
| author | Taylor Cramer <cramertj@google.com> | 2018-06-22 11:36:01 -0700 |
|---|---|---|
| committer | Taylor Cramer <cramertj@google.com> | 2018-06-22 11:36:01 -0700 |
| commit | ee51a3c10aa26b6e6c4e86622181d4a3d396fb34 (patch) | |
| tree | 5e2ca9e0e1b58ecd90511330fc08b266a0390101 /src/libstd/lib.rs | |
| parent | 85e4866320e992126e73d1c640f16a4c755a66b3 (diff) | |
| download | rust-ee51a3c10aa26b6e6c4e86622181d4a3d396fb34.tar.gz rust-ee51a3c10aa26b6e6c4e86622181d4a3d396fb34.zip | |
Review nits and updates
Move future_from_generator out of raw Update await to use $crate Renumber errors
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index c74cd3feca3..caad924ea5b 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -411,6 +411,8 @@ pub use core::ops; #[stable(feature = "rust1", since = "1.0.0")] pub use core::ptr; #[stable(feature = "rust1", since = "1.0.0")] +pub use core::raw; +#[stable(feature = "rust1", since = "1.0.0")] pub use core::result; #[stable(feature = "rust1", since = "1.0.0")] pub use core::option; @@ -461,22 +463,6 @@ pub use core::u128; #[stable(feature = "core_hint", since = "1.27.0")] pub use core::hint; -#[unstable(feature = "futures_api", - reason = "futures in libcore are unstable", - issue = "50547")] -pub mod task { - //! Types and Traits for working with asynchronous tasks. - #[doc(inline)] - pub use core::task::*; - #[doc(inline)] - pub use alloc_crate::task::*; -} - -#[unstable(feature = "futures_api", - reason = "futures in libcore are unstable", - issue = "50547")] -pub use core::future; - pub mod f32; pub mod f64; @@ -495,10 +481,25 @@ pub mod os; pub mod panic; pub mod path; pub mod process; -pub mod raw; pub mod sync; pub mod time; +#[unstable(feature = "futures_api", + reason = "futures in libcore are unstable", + issue = "50547")] +pub mod task { + //! Types and Traits for working with asynchronous tasks. + #[doc(inline)] + pub use core::task::*; + #[doc(inline)] + pub use alloc_crate::task::*; +} + +#[unstable(feature = "futures_api", + reason = "futures in libcore are unstable", + issue = "50547")] +pub mod future; + // Platform-abstraction modules #[macro_use] mod sys_common; |