about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-29 09:48:11 +0000
committerbors <bors@rust-lang.org>2019-04-29 09:48:11 +0000
commit00acb7b24337eb138c934bde7a1efa5ee6a8b797 (patch)
treecf364a69e16454b900079df96f6a2829791f5d7e
parent1b6caa7cd6ae86b580e691b3f075d946800ee51b (diff)
parent1c17489bfefb2dc81e7d1d4ec47405ba8d9461ca (diff)
downloadrust-00acb7b24337eb138c934bde7a1efa5ee6a8b797.tar.gz
rust-00acb7b24337eb138c934bde7a1efa5ee6a8b797.zip
Auto merge of #60364 - JohnTitor:stabilize-const-needs-drop, r=oli-obk
const-stabilize: std::mem::needs_drop

Closes #51929

r? @oli-obk
-rw-r--r--src/libcore/mem.rs1
-rw-r--r--src/test/run-pass/const-needs_drop.rs2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
index 95480c6bf04..5bd442bc066 100644
--- a/src/libcore/mem.rs
+++ b/src/libcore/mem.rs
@@ -459,7 +459,6 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize {
 /// ```
 #[inline]
 #[stable(feature = "needs_drop", since = "1.21.0")]
-#[rustc_const_unstable(feature = "const_needs_drop")]
 pub const fn needs_drop<T>() -> bool {
     intrinsics::needs_drop::<T>()
 }
diff --git a/src/test/run-pass/const-needs_drop.rs b/src/test/run-pass/const-needs_drop.rs
index 9d9dffb5307..871300defaf 100644
--- a/src/test/run-pass/const-needs_drop.rs
+++ b/src/test/run-pass/const-needs_drop.rs
@@ -1,5 +1,3 @@
-#![feature(const_needs_drop)]
-
 use std::mem;
 
 struct Trivial(u8, f32);