diff options
| author | bors <bors@rust-lang.org> | 2015-10-30 19:06:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-30 19:06:43 +0000 |
| commit | cc8d398e28b6b1918ef85479c2d040dfd0fe582d (patch) | |
| tree | b509827a80ff356e37cf103d1af204eca809edfe /src/test | |
| parent | 2aa9f7d3916dcff36a5b8b4978981c056ceb8398 (diff) | |
| parent | e351595c61614c41be08f7508422d5f8a02d1a0e (diff) | |
| download | rust-cc8d398e28b6b1918ef85479c2d040dfd0fe582d.tar.gz rust-cc8d398e28b6b1918ef85479c2d040dfd0fe582d.zip | |
Auto merge of #29475 - apasel422:drop-in, r=alexcrichton
This is a rebase of #27204. r? @alexcrichton CC @Gankro
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/extern_fat_drop.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-pass/extern_fat_drop.rs b/src/test/run-pass/extern_fat_drop.rs index f587dc7821d..deb7e6bd539 100644 --- a/src/test/run-pass/extern_fat_drop.rs +++ b/src/test/run-pass/extern_fat_drop.rs @@ -10,14 +10,14 @@ // aux-build:fat_drop.rs -#![feature(core_intrinsics)] +#![feature(drop_in_place)] extern crate fat_drop; fn main() { unsafe { let s: &mut fat_drop::S = std::mem::uninitialized(); - std::intrinsics::drop_in_place(s); + std::ptr::drop_in_place(s); assert!(fat_drop::DROPPED); } } |