Skip to content

Commit d046421

Browse files
authored
Rollup merge of rust-lang#44639 - budziq:stabilize_needs_drop, r=dtolnay
stabilized needs_drop (fixes rust-lang#41890) fixes rust-lang#41890
2 parents 6b1f0c8 + 0485595 commit d046421

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

src/libarena/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#![feature(core_intrinsics)]
2929
#![feature(dropck_eyepatch)]
3030
#![feature(generic_param_attrs)]
31-
#![feature(needs_drop)]
3231
#![cfg_attr(test, feature(test))]
3332

3433
#![allow(deprecated)]

src/libcore/mem.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize {
332332
/// Here's an example of how a collection might make use of needs_drop:
333333
///
334334
/// ```
335-
/// #![feature(needs_drop)]
336335
/// use std::{mem, ptr};
337336
///
338337
/// pub struct MyCollection<T> {
@@ -359,7 +358,7 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize {
359358
/// }
360359
/// ```
361360
#[inline]
362-
#[unstable(feature = "needs_drop", issue = "41890")]
361+
#[stable(feature = "needs_drop", since = "1.22.0")]
363362
pub fn needs_drop<T>() -> bool {
364363
unsafe { intrinsics::needs_drop::<T>() }
365364
}

src/libstd/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@
276276
#![feature(macro_reexport)]
277277
#![feature(macro_vis_matcher)]
278278
#![feature(needs_panic_runtime)]
279-
#![feature(needs_drop)]
280279
#![feature(never_type)]
281280
#![feature(num_bits_bytes)]
282281
#![feature(old_wrapping)]

0 commit comments

Comments
 (0)