mirror of https://github.com/rust-lang/rust.git
Auto merge of #42976 - ids1024:redoxfix, r=sfackler
Fix Redox build, apparently broken by #42687
This commit is contained in:
commit
4c225c4d17
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue