Rollup merge of rust-lang#44639 - budziq:stabilize_needs_drop, r=dtolnay

stabilized needs_drop (fixes rust-lang#41890) fixes rust-lang#41890
TimNN · Sep 17, 2017 · dfbf8e3 · dfbf8e3
2 parents 269dc0f + 0485595
commit dfbf8e3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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
@@ -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)]