Skip to content
/ rust Public
forked from rust-lang/rust

Commit

Permalink
Error trait in liballoc is unstable
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Aug 30, 2019
1 parent 0411f25 commit 47c3ad1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/liballoc/error.rs
Original file line number Diff line number Diff line change
@@ -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:
//
Expand Down
12 changes: 9 additions & 3 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 47c3ad1

Please sign in to comment.