user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove an unsafe function definition in __thread_local_inner.

Browse source 
This fixes a build error when using thread_local!() in a deny(unsafe_code)
scope in Servo for Android.
This commit is contained in:
Ms2ger 2015-03-21 10:34:15 +01:00
parent ecf8c64e1b
commit 29aca83eb4
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/thread_local/mod.rs
View file

@ -205,15 +205,13 @@ macro_rules! __thread_local_inner {
#[cfg(any(not(any(target_os = "macos", target_os = "linux")), target_arch = "aarch64"))]
const _INIT: ::std::thread_local::__impl::KeyInner<$t> = {
unsafe extern fn __destroy(ptr: *mut u8) {
::std::thread_local::__impl::destroy_value::<$t>(ptr);
}
::std::thread_local::__impl::KeyInner {
inner: ::std::cell::UnsafeCell { value: $init },
os: ::std::thread_local::__impl::OsStaticKey {
inner: ::std::thread_local::__impl::OS_INIT_INNER,
dtor: ::std::option::Option::Some(__destroy as unsafe extern fn(*mut u8)),
dtor: ::std::option::Option::Some(
::std::thread_local::__impl::destroy_value::<$t>
),
},
}
};