about summary refs log tree commit diff
path: root/src/libcore/mem
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-06-29 11:18:06 +0200
committerGitHub <noreply@github.com>2019-06-29 11:18:06 +0200
commit6c0ab739fb77c67d00ba5b5fa357deec404f9bce (patch)
tree6e1e9f5e320ce32db62f3f5ea60fa08374f59d6b /src/libcore/mem
parent8ec39423dd0d02f81866b675dd9299972e1b9af5 (diff)
parentc77024ca4e100a32163573407768c11bad760a00 (diff)
Rollup merge of #61199 - ollie27:rustdoc_cfg_test, r=QuietMisdreavus
Revert "Set test flag when rustdoc is running with --test option"

Reverts https://github.com/rust-lang/rust/pull/59940.

It caused doctests in this repository to no longer be tested including all of the core crate.
Diffstat (limited to 'src/libcore/mem')
-rw-r--r--src/libcore/mem/mod.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs
index 770d1ca8e75..e110e93a954 100644
--- a/src/libcore/mem/mod.rs
+++ b/src/libcore/mem/mod.rs
@@ -510,6 +510,8 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
 /// A simple example:
 ///
 /// ```
+/// #![feature(mem_take)]
+///
 /// use std::mem;
 ///
 /// let mut v: Vec<i32> = vec![1, 2];
@@ -540,7 +542,8 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
 /// `self`, allowing it to be returned:
 ///
 /// ```
-/// # #![allow(dead_code)]
+/// #![feature(mem_take)]
+///
 /// use std::mem;
 ///
 /// # struct Buffer<T> { buf: Vec<T> }