Skip to content

Commit e507572

Browse files
committed
Auto merge of #2931 - thomcc:option-root, r=JohnTitor
Use `::Option` and not `Option` for `pthread_jit_write_callback_t` The `pthread_jit_write_callback_t` type alias (introduced by #2896) uses `Option` rather than `::Option`, which causes problems when trying to update the `libc` dependency that `std` has. (Please cut a release after merging this <3)
2 parents 362960c + 1d7029a commit e507572

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/unix/bsd/apple/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ pub type thread_throughput_qos_policy_t = *mut thread_throughput_qos_policy;
119119

120120
pub type pthread_introspection_hook_t =
121121
extern "C" fn(event: ::c_uint, thread: ::pthread_t, addr: *mut ::c_void, size: ::size_t);
122-
pub type pthread_jit_write_callback_t = Option<extern "C" fn(ctx: *mut ::c_void) -> ::c_int>;
122+
pub type pthread_jit_write_callback_t = ::Option<extern "C" fn(ctx: *mut ::c_void) -> ::c_int>;
123123

124124
pub type vm_statistics_t = *mut vm_statistics;
125125
pub type vm_statistics_data_t = vm_statistics;

0 commit comments

Comments
 (0)