about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDodo <kasper199914@gmail.com>2020-06-30 10:53:11 +0200
committerDodo <kasper199914@gmail.com>2020-06-30 11:34:27 +0200
commita065096ff40f7910fd58aa36a76be6cb1c5f1d4d (patch)
treee4ea75abd014024989351bedd93ab23509523b8b
parenta1528c432e45339d9b5602a19ac3571e2900d37b (diff)
downloadrust-a065096ff40f7910fd58aa36a76be6cb1c5f1d4d.tar.gz
rust-a065096ff40f7910fd58aa36a76be6cb1c5f1d4d.zip
stabilize const mem::forget
-rw-r--r--src/libcore/mem/mod.rs2
-rw-r--r--src/libcore/tests/lib.rs1
-rw-r--r--src/test/ui/consts/const_forget.rs2
3 files changed, 1 insertions, 4 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs
index 46e6ea7cd18..84f8f1f7790 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 c60ce8ec837..772ec079ef2 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);