Skip to content

Commit

Permalink
Auto merge of #2931 - thomcc:option-root, r=JohnTitor
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
bors committed Sep 29, 2022
2 parents 362960c + 1d7029a commit e507572
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/unix/bsd/apple/mod.rs
Expand Up @@ -119,7 +119,7 @@ pub type thread_throughput_qos_policy_t = *mut thread_throughput_qos_policy;

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

pub type vm_statistics_t = *mut vm_statistics;
pub type vm_statistics_data_t = vm_statistics;
Expand Down

0 comments on commit e507572

Please sign in to comment.