Skip to content

Commit

Permalink
Rollup merge of rust-lang#39313 - est31:drop_in_place_is_stable, r=Gu…
Browse files Browse the repository at this point in the history
…illaumeGomez

drop_in_place is stable now, don't #![feature] it in the nomicon and a test.

It was stable since Rust 1.8.

r? @GuillaumeGomez
  • Loading branch information
alexcrichton committed Jan 28, 2017
2 parents e1a5c46 + ff11f98 commit 06fcccf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/doc/nomicon/destructors.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/extern_fat_drop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// aux-build:fat_drop.rs

#![feature(drop_in_place)]

extern crate fat_drop;

fn main() {
Expand Down

0 comments on commit 06fcccf

Please sign in to comment.