diff --git a/src/liballoc/error.rs b/src/liballoc/error.rs index 1c2532e3302f5..d78290ce976d5 100644 --- a/src/liballoc/error.rs +++ b/src/liballoc/error.rs @@ -1,6 +1,6 @@ //! Traits for working with Errors. -#![stable(feature = "rust1", since = "1.0.0")] +#![unstable(feature = "alloc_error", reason = "Error trait in liballoc is unstable", issue="0")] // A note about crates and the facade: // diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index cbe8bdd94c0de..6ee55c1f2cc2e 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -229,6 +229,7 @@ // compiler details that will never be stable // NB: the following list is sorted to minimize merge conflicts. #![feature(alloc_error_handler)] +#![feature(alloc_error)] #![feature(alloc_layout_extra)] #![feature(allocator_api)] #![feature(allocator_internals)] @@ -447,9 +448,6 @@ pub use core::hint; #[stable(feature = "core_array", since = "1.36.0")] pub use core::array; -#[stable(feature = "rust1", since = "1.0.0")] -pub use alloc_crate::error; - pub mod f32; pub mod f64; @@ -481,6 +479,14 @@ pub mod task { #[stable(feature = "futures_api", since = "1.36.0")] pub mod future; +#[stable(feature = "rust1", since = "1.0.0")] +pub mod error { + //! Traits for working with Errors. + + #[stable(feature = "rust1", since = "1.0.0")] + pub use alloc_crate::error::*; +} + // Platform-abstraction modules #[macro_use] mod sys_common;