diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2021-02-05 12:26:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 12:26:07 +0100 |
| commit | e077dffaeca017dcc961b3ca7ed4c5d9e349dd05 (patch) | |
| tree | 6da08b781dc0bffc013a822fc991038450b1c50b /library/core/src/alloc | |
| parent | 469d535c13714830e8c3bb6790a64d944efbb4ee (diff) | |
| parent | 0c3a7d8b8598ef792995a9173dfa569fff445568 (diff) | |
| download | rust-e077dffaeca017dcc961b3ca7ed4c5d9e349dd05.tar.gz rust-e077dffaeca017dcc961b3ca7ed4c5d9e349dd05.zip | |
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.
Diffstat (limited to 'library/core/src/alloc')
| -rw-r--r-- | library/core/src/alloc/layout.rs | 4 | ||||
| -rw-r--r-- | library/core/src/alloc/mod.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/core/src/alloc/layout.rs b/library/core/src/alloc/layout.rs index c572c66ce32..9dc3f05dae5 100644 --- a/library/core/src/alloc/layout.rs +++ b/library/core/src/alloc/layout.rs @@ -400,7 +400,7 @@ impl Layout { #[stable(feature = "alloc_layout", since = "1.28.0")] #[rustc_deprecated( - since = "1.51.0", + since = "1.52.0", reason = "Name does not follow std convention, use LayoutError", suggestion = "LayoutError" )] @@ -409,7 +409,7 @@ pub type LayoutErr = LayoutError; /// The parameters given to `Layout::from_size_align` /// or some other `Layout` constructor /// do not satisfy its documented constraints. -#[stable(feature = "alloc_layout_error", since = "1.49.0")] +#[stable(feature = "alloc_layout_error", since = "1.50.0")] #[derive(Clone, PartialEq, Eq, Debug)] pub struct LayoutError { private: (), diff --git a/library/core/src/alloc/mod.rs b/library/core/src/alloc/mod.rs index 9c2a0146e2c..06a761531b6 100644 --- a/library/core/src/alloc/mod.rs +++ b/library/core/src/alloc/mod.rs @@ -11,14 +11,14 @@ pub use self::global::GlobalAlloc; pub use self::layout::Layout; #[stable(feature = "alloc_layout", since = "1.28.0")] #[rustc_deprecated( - since = "1.51.0", + since = "1.52.0", reason = "Name does not follow std convention, use LayoutError", suggestion = "LayoutError" )] #[allow(deprecated, deprecated_in_future)] pub use self::layout::LayoutErr; -#[stable(feature = "alloc_layout_error", since = "1.49.0")] +#[stable(feature = "alloc_layout_error", since = "1.50.0")] pub use self::layout::LayoutError; use crate::fmt; |