Skip to content

Commit 47c3ad1

Browse files
committed
Error trait in liballoc is unstable
1 parent 0411f25 commit 47c3ad1

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/liballoc/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Traits for working with Errors.
22
3-
#![stable(feature = "rust1", since = "1.0.0")]
3+
#![unstable(feature = "alloc_error", reason = "Error trait in liballoc is unstable", issue="0")]
44

55
// A note about crates and the facade:
66
//

src/libstd/lib.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@
229229
// compiler details that will never be stable
230230
// NB: the following list is sorted to minimize merge conflicts.
231231
#![feature(alloc_error_handler)]
232+
#![feature(alloc_error)]
232233
#![feature(alloc_layout_extra)]
233234
#![feature(allocator_api)]
234235
#![feature(allocator_internals)]
@@ -447,9 +448,6 @@ pub use core::hint;
447448
#[stable(feature = "core_array", since = "1.36.0")]
448449
pub use core::array;
449450

450-
#[stable(feature = "rust1", since = "1.0.0")]
451-
pub use alloc_crate::error;
452-
453451
pub mod f32;
454452
pub mod f64;
455453

@@ -481,6 +479,14 @@ pub mod task {
481479
#[stable(feature = "futures_api", since = "1.36.0")]
482480
pub mod future;
483481

482+
#[stable(feature = "rust1", since = "1.0.0")]
483+
pub mod error {
484+
//! Traits for working with Errors.
485+
486+
#[stable(feature = "rust1", since = "1.0.0")]
487+
pub use alloc_crate::error::*;
488+
}
489+
484490
// Platform-abstraction modules
485491
#[macro_use]
486492
mod sys_common;

0 commit comments

Comments
 (0)