Skip to content

Commit d4f7f97

Browse files
committed
Auto merge of #64716 - jonhoo:stabilize-mem-take, r=SimonSapin
Stabilize mem::take (mem_take) Tracking issue: #61129 r? @matklad
2 parents 000d90b + 45aca11 commit d4f7f97

File tree

14 files changed

+1
-18
lines changed

14 files changed

+1
-18
lines changed

src/liballoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
#![feature(maybe_uninit_extra, maybe_uninit_slice)]
122122
#![feature(alloc_layout_extra)]
123123
#![feature(try_trait)]
124-
#![feature(mem_take)]
125124
#![feature(associated_type_bounds)]
126125

127126
// Allow testing this library

src/libcore/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
#![feature(adx_target_feature)]
128128
#![feature(maybe_uninit_slice)]
129129
#![feature(external_doc)]
130-
#![feature(mem_take)]
131130
#![feature(associated_type_bounds)]
132131

133132
#[prelude_import]

src/libcore/mem/mod.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,6 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
520520
/// A simple example:
521521
///
522522
/// ```
523-
/// #![feature(mem_take)]
524-
///
525523
/// use std::mem;
526524
///
527525
/// let mut v: Vec<i32> = vec![1, 2];
@@ -552,8 +550,6 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
552550
/// `self`, allowing it to be returned:
553551
///
554552
/// ```
555-
/// #![feature(mem_take)]
556-
///
557553
/// use std::mem;
558554
///
559555
/// # struct Buffer<T> { buf: Vec<T> }
@@ -572,7 +568,7 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
572568
///
573569
/// [`Clone`]: ../../std/clone/trait.Clone.html
574570
#[inline]
575-
#[unstable(feature = "mem_take", issue = "61129")]
571+
#[stable(feature = "mem_take", since = "1.40.0")]
576572
pub fn take<T: Default>(dest: &mut T) -> T {
577573
replace(dest, T::default())
578574
}

src/libproc_macro/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#![feature(extern_types)]
2626
#![feature(in_band_lifetimes)]
2727
#![feature(optin_builtin_traits)]
28-
#![feature(mem_take)]
2928
#![feature(non_exhaustive)]
3029
#![feature(rustc_attrs)]
3130
#![feature(specialization)]

src/librustc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
#![feature(crate_visibility_modifier)]
5959
#![feature(proc_macro_hygiene)]
6060
#![feature(log_syntax)]
61-
#![feature(mem_take)]
6261
#![feature(associated_type_bounds)]
6362
#![feature(rustc_attrs)]
6463

src/librustc_codegen_llvm/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#![feature(link_args)]
2020
#![feature(static_nobundle)]
2121
#![feature(trusted_len)]
22-
#![feature(mem_take)]
2322

2423
use back::write::{create_target_machine, create_informational_target_machine};
2524
use syntax_pos::symbol::Symbol;

src/librustc_codegen_ssa/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(in_band_lifetimes)]
1111
#![feature(nll)]
1212
#![feature(trusted_len)]
13-
#![feature(mem_take)]
1413
#![feature(associated_type_bounds)]
1514

1615
#![recursion_limit="256"]

src/librustc_mir/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
2222
#![feature(slice_concat_ext)]
2323
#![feature(trusted_len)]
2424
#![feature(try_blocks)]
25-
#![feature(mem_take)]
2625
#![feature(associated_type_bounds)]
2726
#![feature(range_is_empty)]
2827
#![feature(stmt_expr_attributes)]

src/librustc_resolve/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#![feature(crate_visibility_modifier)]
1313
#![feature(label_break_value)]
14-
#![feature(mem_take)]
1514
#![feature(nll)]
1615

1716
#![recursion_limit="256"]

src/librustc_typeck/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ This API is completely unstable and subject to change.
6767
#![feature(nll)]
6868
#![feature(slice_patterns)]
6969
#![feature(never_type)]
70-
#![feature(mem_take)]
7170

7271
#![recursion_limit="256"]
7372

src/librustdoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(const_fn)]
1616
#![feature(drain_filter)]
1717
#![feature(never_type)]
18-
#![feature(mem_take)]
1918
#![feature(unicode_internals)]
2019

2120
#![recursion_limit="256"]

src/libstd/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@
277277
#![feature(log_syntax)]
278278
#![feature(maybe_uninit_ref)]
279279
#![feature(maybe_uninit_slice)]
280-
#![feature(mem_take)]
281280
#![feature(needs_panic_runtime)]
282281
#![feature(never_type)]
283282
#![feature(nll)]

src/libsyntax/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#![feature(const_transmute)]
1313
#![feature(crate_visibility_modifier)]
1414
#![feature(label_break_value)]
15-
#![feature(mem_take)]
1615
#![feature(nll)]
1716
#![feature(proc_macro_diagnostic)]
1817
#![feature(proc_macro_internals)]

src/libsyntax_ext/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#![feature(crate_visibility_modifier)]
77
#![feature(decl_macro)]
8-
#![feature(mem_take)]
98
#![feature(nll)]
109
#![feature(proc_macro_internals)]
1110
#![feature(proc_macro_quote)]

0 commit comments

Comments
 (0)