diff options
| author | bors <bors@rust-lang.org> | 2017-07-03 12:20:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-03 12:20:57 +0000 |
| commit | 4c225c4d1732537aff63dd97c2b7ac681fd3d188 (patch) | |
| tree | 5175c3902319738ec5c8695155014cbba98cc454 /src/libstd/sys | |
| parent | 1d2db7b9e8082f0459e000985d77fc7ad0dabade (diff) | |
| parent | 8ed83f4aaf75821feff3236b1c4d8d6e5302efba (diff) | |
| download | rust-4c225c4d1732537aff63dd97c2b7ac681fd3d188.tar.gz rust-4c225c4d1732537aff63dd97c2b7ac681fd3d188.zip | |
Auto merge of #42976 - ids1024:redoxfix, r=sfackler
Fix Redox build, apparently broken by #42687
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/redox/fast_thread_local.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libstd/sys/redox/fast_thread_local.rs b/src/libstd/sys/redox/fast_thread_local.rs index 7dc61ce6654..9f0eee024d5 100644 --- a/src/libstd/sys/redox/fast_thread_local.rs +++ b/src/libstd/sys/redox/fast_thread_local.rs @@ -57,7 +57,7 @@ impl<T> Key<T> { } } -unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { +pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { // The fallback implementation uses a vanilla OS-based TLS key to track // the list of destructors that need to be run for this thread. The key // then has its own destructor which runs all the other destructors. @@ -115,3 +115,7 @@ pub unsafe extern fn destroy_value<T>(ptr: *mut u8) { ptr::drop_in_place((*ptr).inner.get()); } } + +pub fn requires_move_before_drop() -> bool { + false +} |
