From e351595c61614c41be08f7508422d5f8a02d1a0e Mon Sep 17 00:00:00 2001
From: Alexis Beingessner <a.beingessner@gmail.com>
Date: Wed, 19 Aug 2015 15:55:36 -0700
Subject: don't use drop_in_place as an intrinsic

---
 src/libstd/lib.rs          | 2 ++
 src/libstd/thread/local.rs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/libstd')

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());
         }
     }
 }
-- 
cgit 1.4.1-3-g733a5