diff options
| author | Tim Neumann <mail@timnn.me> | 2017-09-17 13:19:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 13:19:14 +0200 |
| commit | d046421743bd2e3f26840abc6398912936960408 (patch) | |
| tree | 20f29a0259f43734ea9d070c0c4878cdc1656752 | |
| parent | 6b1f0c8694a7443b342cff913e08f8ba7252d1c9 (diff) | |
| parent | 04855950b9d93cc9409891eb6368257299ffcfca (diff) | |
| download | rust-d046421743bd2e3f26840abc6398912936960408.tar.gz rust-d046421743bd2e3f26840abc6398912936960408.zip | |
Rollup merge of #44639 - budziq:stabilize_needs_drop, r=dtolnay
stabilized needs_drop (fixes #41890) fixes #41890
| -rw-r--r-- | src/libarena/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/mem.rs | 3 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index 96fcc81e8e6..2be7b1bc2e1 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 3e24623dad8..34994dc3b70 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 aa1337a9da0..1a0f8b8d217 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)] |