From 315730fb273c4d55c4c25d4fba2b68dcd6a54093 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 11 Feb 2015 14:40:09 -0800 Subject: Test fixes and rebase conflicts --- src/libstd/thread_local/mod.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libstd/thread_local') diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index 0ec241a65e2..eab9cd84539 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -452,6 +452,7 @@ mod imp { } #[doc(hidden)] + #[stable(feature = "rust1", since = "1.0.0")] pub unsafe extern fn destroy_value(ptr: *mut u8) { let ptr = ptr as *mut Key; // Right before we run the user destructor be sure to flag the @@ -523,6 +524,7 @@ mod imp { } #[doc(hidden)] + #[stable(feature = "rust1", since = "1.0.0")] pub unsafe extern fn destroy_value(ptr: *mut u8) { // The OS TLS ensures that this key contains a NULL value when this // destructor starts to run. We set it back to a sentinel value of 1 to -- cgit 1.4.1-3-g733a5