Skip to content

Commit

Permalink
Auto merge of #42976 - ids1024:redoxfix, r=sfackler
Browse files Browse the repository at this point in the history
Fix Redox build, apparently broken by #42687
  • Loading branch information
bors committed Jul 3, 2017
2 parents 1d2db7b + 8ed83f4 commit 4c225c4
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/libstd/sys/redox/fast_thread_local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
}

0 comments on commit 4c225c4

Please sign in to comment.