Skip to content

Commit 78e57dc

Browse files
m-ou-seehuss
authored andcommitted
Rollup merge of #81767 - exrook:layout-error-stability, r=Mark-Simulacrum
Update LayoutError/LayoutErr stability attributes `LayoutError` ended up not making it into 1.49.0, updating the stability attributes to reflect that. I also pushed `LayoutErr` deprecation back a release to allow 2 releases before the deprecation comes into effect. This change should be backported to beta.
1 parent e364d4a commit 78e57dc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

library/core/src/alloc/layout.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ impl Layout {
394394

395395
#[stable(feature = "alloc_layout", since = "1.28.0")]
396396
#[rustc_deprecated(
397-
since = "1.51.0",
397+
since = "1.52.0",
398398
reason = "Name does not follow std convention, use LayoutError",
399399
suggestion = "LayoutError"
400400
)]
@@ -403,7 +403,7 @@ pub type LayoutErr = LayoutError;
403403
/// The parameters given to `Layout::from_size_align`
404404
/// or some other `Layout` constructor
405405
/// do not satisfy its documented constraints.
406-
#[stable(feature = "alloc_layout_error", since = "1.49.0")]
406+
#[stable(feature = "alloc_layout_error", since = "1.50.0")]
407407
#[derive(Clone, PartialEq, Eq, Debug)]
408408
pub struct LayoutError {
409409
private: (),

library/core/src/alloc/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ pub use self::global::GlobalAlloc;
1111
pub use self::layout::Layout;
1212
#[stable(feature = "alloc_layout", since = "1.28.0")]
1313
#[rustc_deprecated(
14-
since = "1.51.0",
14+
since = "1.52.0",
1515
reason = "Name does not follow std convention, use LayoutError",
1616
suggestion = "LayoutError"
1717
)]
1818
#[allow(deprecated, deprecated_in_future)]
1919
pub use self::layout::LayoutErr;
2020

21-
#[stable(feature = "alloc_layout_error", since = "1.49.0")]
21+
#[stable(feature = "alloc_layout_error", since = "1.50.0")]
2222
pub use self::layout::LayoutError;
2323

2424
use crate::fmt;

0 commit comments

Comments
 (0)