diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-16 17:23:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-16 17:23:08 +0100 |
| commit | 95d8aadcfccaff73faad1cf4d1384d0eb424d90d (patch) | |
| tree | 87a88b469a28d3f6c0f895009d84bf6aef943c78 | |
| parent | 7407c4e37d3342c20835bc2caaff28863078b266 (diff) | |
| parent | e1c9a88152fea67777549d397c17189157f6e6c2 (diff) | |
| download | rust-95d8aadcfccaff73faad1cf4d1384d0eb424d90d.tar.gz rust-95d8aadcfccaff73faad1cf4d1384d0eb424d90d.zip | |
Rollup merge of #91796 - not-my-profile:fix-const_manually_drop-since, r=kennytm
Fix since attribute for const_manually_drop feature const_manually_drop was stabilized in 1.32 as mentioned in https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1320-2019-01-17
| -rw-r--r-- | library/core/src/mem/manually_drop.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/core/src/mem/manually_drop.rs b/library/core/src/mem/manually_drop.rs index 20b6453990d..f577f102e8d 100644 --- a/library/core/src/mem/manually_drop.rs +++ b/library/core/src/mem/manually_drop.rs @@ -64,7 +64,7 @@ impl<T> ManuallyDrop<T> { /// ``` #[must_use = "if you don't need the wrapper, you can use `mem::forget` instead"] #[stable(feature = "manually_drop", since = "1.20.0")] - #[rustc_const_stable(feature = "const_manually_drop", since = "1.36.0")] + #[rustc_const_stable(feature = "const_manually_drop", since = "1.32.0")] #[inline(always)] pub const fn new(value: T) -> ManuallyDrop<T> { ManuallyDrop { value } @@ -82,7 +82,7 @@ impl<T> ManuallyDrop<T> { /// let _: Box<()> = ManuallyDrop::into_inner(x); // This drops the `Box`. /// ``` #[stable(feature = "manually_drop", since = "1.20.0")] - #[rustc_const_stable(feature = "const_manually_drop", since = "1.36.0")] + #[rustc_const_stable(feature = "const_manually_drop", since = "1.32.0")] #[inline(always)] pub const fn into_inner(slot: ManuallyDrop<T>) -> T { slot.value |