about summary refs log tree commit diff
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2017-01-26 10:37:20 +0100
committerest31 <MTest31@outlook.com>2017-01-26 10:38:22 +0100
commitff11f987c669a62058267c5b71f804b03fe9954d (patch)
treec1add3d92c2ead3dd710a28be7fa63c45c8daf76
parent2f0463a4a4f323c4deffc861349e38c6b5091782 (diff)
drop_in_place is stable now, don't #![feature] it in the nomicon and a test
It was stable since Rust 1.8.
-rw-r--r--src/doc/nomicon/destructors.md6
-rw-r--r--src/test/run-pass/extern_fat_drop.rs2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/doc/nomicon/destructors.md b/src/doc/nomicon/destructors.md
index c6fa5b079db..be4730cf8bc 100644
--- a/src/doc/nomicon/destructors.md
+++ b/src/doc/nomicon/destructors.md
@@ -26,7 +26,7 @@ this is totally fine.
 For instance, a custom implementation of `Box` might write `Drop` like this:
 
 ```rust
-#![feature(alloc, heap_api, drop_in_place, unique)]
+#![feature(alloc, heap_api, unique)]
 
 extern crate alloc;
 
@@ -57,7 +57,7 @@ use-after-free the `ptr` because when drop exits, it becomes inaccessible.
 However this wouldn't work:
 
 ```rust
-#![feature(alloc, heap_api, drop_in_place, unique)]
+#![feature(alloc, heap_api, unique)]
 
 extern crate alloc;
 
@@ -135,7 +135,7 @@ The classic safe solution to overriding recursive drop and allowing moving out
 of Self during `drop` is to use an Option:
 
 ```rust
-#![feature(alloc, heap_api, drop_in_place, unique)]
+#![feature(alloc, heap_api, unique)]
 
 extern crate alloc;
 
diff --git a/src/test/run-pass/extern_fat_drop.rs b/src/test/run-pass/extern_fat_drop.rs
index deb7e6bd539..8ce1f744dee 100644
--- a/src/test/run-pass/extern_fat_drop.rs
+++ b/src/test/run-pass/extern_fat_drop.rs
@@ -10,8 +10,6 @@
 
 // aux-build:fat_drop.rs
 
-#![feature(drop_in_place)]
-
 extern crate fat_drop;
 
 fn main() {