diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-07-10 23:26:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 23:26:28 -0700 |
| commit | efda2b58b095306d068a3a165de62acd1e94911b (patch) | |
| tree | 8188422609bb4819c94cc19aa5718b937222d1a0 | |
| parent | f4f969027c6378264be509ba5ae512e35258f2e5 (diff) | |
| parent | a065096ff40f7910fd58aa36a76be6cb1c5f1d4d (diff) | |
| download | rust-efda2b58b095306d068a3a165de62acd1e94911b.tar.gz rust-efda2b58b095306d068a3a165de62acd1e94911b.zip | |
Rollup merge of #73887 - DutchGhost:master, r=oli-obk
stabilize const mem::forget Stabilizes const `mem::forget` as implemented in https://github.com/rust-lang/rust/pull/69617 and tracked in https://github.com/rust-lang/rust/issues/69616. Closes https://github.com/rust-lang/rust/issues/69616
| -rw-r--r-- | src/libcore/mem/mod.rs | 2 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/consts/const_forget.rs | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs index 0a976a4ca00..98d2027268b 100644 --- a/src/libcore/mem/mod.rs +++ b/src/libcore/mem/mod.rs @@ -142,7 +142,7 @@ pub use crate::intrinsics::transmute; /// [ub]: ../../reference/behavior-considered-undefined.html /// [`ManuallyDrop`]: struct.ManuallyDrop.html #[inline] -#[rustc_const_unstable(feature = "const_forget", issue = "69616")] +#[rustc_const_stable(feature = "const_forget", since = "1.46.0")] #[stable(feature = "rust1", since = "1.0.0")] pub const fn forget<T>(t: T) { ManuallyDrop::new(t); diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index 68a5e20a66f..090ce471745 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -40,7 +40,6 @@ #![feature(const_raw_ptr_deref)] #![feature(never_type)] #![feature(unwrap_infallible)] -#![feature(const_forget)] #![feature(option_unwrap_none)] #![feature(peekable_next_if)] #![feature(partition_point)] diff --git a/src/test/ui/consts/const_forget.rs b/src/test/ui/consts/const_forget.rs index 2dcb72a5a09..ec7dde8c9ec 100644 --- a/src/test/ui/consts/const_forget.rs +++ b/src/test/ui/consts/const_forget.rs @@ -1,7 +1,5 @@ // check-pass -#![feature(const_forget)] - use std::mem::forget; const _: () = forget(0i32); |