diff options
| author | Ian Douglas Scott <ian@iandouglasscott.com> | 2017-06-29 18:18:32 -0700 |
|---|---|---|
| committer | Ian Douglas Scott <ian@iandouglasscott.com> | 2017-06-29 18:18:32 -0700 |
| commit | 8ed83f4aaf75821feff3236b1c4d8d6e5302efba (patch) | |
| tree | 15f50a8f6abca676f3b1eb0a829e8b37a8afce5c /src/libstd/sys | |
| parent | 3bfc18a9619a5151ff4f11618db9cd882996ba6f (diff) | |
| download | rust-8ed83f4aaf75821feff3236b1c4d8d6e5302efba.tar.gz rust-8ed83f4aaf75821feff3236b1c4d8d6e5302efba.zip | |
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 +} |
