Skip to content

Commit e077dff

Browse files
authored
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.
2 parents 469d535 + 0c3a7d8 commit e077dff

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
@@ -400,7 +400,7 @@ impl Layout {
400400

401401
#[stable(feature = "alloc_layout", since = "1.28.0")]
402402
#[rustc_deprecated(
403-
since = "1.51.0",
403+
since = "1.52.0",
404404
reason = "Name does not follow std convention, use LayoutError",
405405
suggestion = "LayoutError"
406406
)]
@@ -409,7 +409,7 @@ pub type LayoutErr = LayoutError;
409409
/// The parameters given to `Layout::from_size_align`
410410
/// or some other `Layout` constructor
411411
/// do not satisfy its documented constraints.
412-
#[stable(feature = "alloc_layout_error", since = "1.49.0")]
412+
#[stable(feature = "alloc_layout_error", since = "1.50.0")]
413413
#[derive(Clone, PartialEq, Eq, Debug)]
414414
pub struct LayoutError {
415415
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)