Skip to content

Commit 8ed83f4

Browse files
committedJun 30, 2017
Fix Redox build, apparently broken by #42687
1 parent 3bfc18a commit 8ed83f4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed
 

‎src/libstd/sys/redox/fast_thread_local.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl<T> Key<T> {
5757
}
5858
}
5959

60-
unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) {
60+
pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) {
6161
// The fallback implementation uses a vanilla OS-based TLS key to track
6262
// the list of destructors that need to be run for this thread. The key
6363
// 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) {
115115
ptr::drop_in_place((*ptr).inner.get());
116116
}
117117
}
118+
119+
pub fn requires_move_before_drop() -> bool {
120+
false
121+
}

0 commit comments

Comments
 (0)
Please sign in to comment.