Skip to content

Commit

Permalink
Rollup merge of #44639 - budziq:stabilize_needs_drop, r=dtolnay
Browse files Browse the repository at this point in the history
stabilized needs_drop (fixes #41890)

fixes #41890
  • Loading branch information
TimNN authored Sep 17, 2017
2 parents 22e27f1 + 0485595 commit 7019666
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion src/libarena/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#![feature(core_intrinsics)]
#![feature(dropck_eyepatch)]
#![feature(generic_param_attrs)]
#![feature(needs_drop)]
#![cfg_attr(test, feature(test))]

#![allow(deprecated)]
Expand Down
3 changes: 1 addition & 2 deletions src/libcore/mem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand All @@ -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>() }
}
Expand Down
1 change: 0 additions & 1 deletion src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down

0 comments on commit 7019666

Please sign in to comment.