From 0266c134a724626506a256da58a982ea8a6e3ec8 Mon Sep 17 00:00:00 2001 From: Jacob Hughes Date: Mon, 28 Sep 2020 19:43:39 -0400 Subject: [PATCH] Deprecate LayoutErr --- library/core/src/alloc/layout.rs | 5 +++++ library/core/src/alloc/mod.rs | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/library/core/src/alloc/layout.rs b/library/core/src/alloc/layout.rs index e338baea645..87f0fc4abe2 100644 --- a/library/core/src/alloc/layout.rs +++ b/library/core/src/alloc/layout.rs @@ -393,6 +393,11 @@ pub fn array(n: usize) -> Result { } #[stable(feature = "alloc_layout", since = "1.28.0")] +#[rustc_deprecated( + since = "1.51.0", + reason = "use LayoutError instead", + suggestion = "LayoutError" +)] pub type LayoutErr = LayoutError; /// The parameters given to `Layout::from_size_align` diff --git a/library/core/src/alloc/mod.rs b/library/core/src/alloc/mod.rs index 6635e4229e0..bd928423fec 100644 --- a/library/core/src/alloc/mod.rs +++ b/library/core/src/alloc/mod.rs @@ -8,7 +8,15 @@ #[stable(feature = "global_alloc", since = "1.28.0")] pub use self::global::GlobalAlloc; #[stable(feature = "alloc_layout", since = "1.28.0")] -pub use self::layout::{Layout, LayoutErr}; +pub use self::layout::Layout; +#[stable(feature = "alloc_layout", since = "1.28.0")] +#[rustc_deprecated( + since = "1.51.0", + reason = "use LayoutError instead", + suggestion = "LayoutError" +)] +#[allow(deprecated, deprecated_in_future)] +pub use self::layout::LayoutErr; #[stable(feature = "alloc_layout_error", since = "1.49.0")] pub use self::layout::LayoutError; -- 2.44.0