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/libstd | |
| 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/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/thread/local.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 93d1ce168b7..e78081f5bf4 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -251,6 +251,8 @@ #![feature(vec_push_all)] #![feature(wrapping)] #![feature(zero_one)] +#![feature(drop_in_place)] + #![cfg_attr(windows, feature(str_utf16))] #![cfg_attr(test, feature(float_from_str_radix, range_inclusive, float_extras))] #![cfg_attr(test, feature(test, rustc_private))] diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index c204f79614a..119429cc584 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -411,7 +411,7 @@ mod imp { if cfg!(target_os = "macos") { ptr::read((*ptr).inner.get()); } else { - intrinsics::drop_in_place((*ptr).inner.get()); + ptr::drop_in_place((*ptr).inner.get()); } } } |