From 04855950b9d93cc9409891eb6368257299ffcfca Mon Sep 17 00:00:00 2001
From: Michal Budzynski <budziq@gmail.com>
Date: Sat, 16 Sep 2017 23:41:04 +0200
Subject: [PATCH] stabilized needs_drop (fixes #41890)

---
 src/libarena/lib.rs | 1 -
 src/libcore/mem.rs  | 3 +--
 src/libstd/lib.rs   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs
index 96fcc81e8e6ed..2be7b1bc2e17c 100644
--- a/src/libarena/lib.rs
+++ b/src/libarena/lib.rs
@@ -28,7 +28,6 @@
 #![feature(core_intrinsics)]
 #![feature(dropck_eyepatch)]
 #![feature(generic_param_attrs)]
-#![feature(needs_drop)]
 #![cfg_attr(test, feature(test))]
 
 #![allow(deprecated)]
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
index 3e24623dad895..34994dc3b70f3 100644
--- a/src/libcore/mem.rs
+++ b/src/libcore/mem.rs
@@ -332,7 +332,6 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize {
 /// Here's an example of how a collection might make use of needs_drop:
 ///
 /// ```
-/// #![feature(needs_drop)]
 /// use std::{mem, ptr};
 ///
 /// pub struct MyCollection<T> {
@@ -359,7 +358,7 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize {
 /// }
 /// ```
 #[inline]
-#[unstable(feature = "needs_drop", issue = "41890")]
+#[stable(feature = "needs_drop", since = "1.22.0")]
 pub fn needs_drop<T>() -> bool {
     unsafe { intrinsics::needs_drop::<T>() }
 }
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index aa1337a9da050..1a0f8b8d2177e 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -276,7 +276,6 @@
 #![feature(macro_reexport)]
 #![feature(macro_vis_matcher)]
 #![feature(needs_panic_runtime)]
-#![feature(needs_drop)]
 #![feature(never_type)]
 #![feature(num_bits_bytes)]
 #![feature(old_wrapping)]