diff options
| author | bors <bors@rust-lang.org> | 2022-09-29 08:54:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-29 08:54:34 +0000 |
| commit | e507572650a7d4d70c351abff8ee1dc6274c0550 (patch) | |
| tree | f78bffc3307d6c703dcd346c9041956236fb5316 | |
| parent | 362960cecb52eb87fb07d022f6b0fe3b257c0592 (diff) | |
| parent | 1d7029adb840ba50e43f8e0aedb28fbddf322cdd (diff) | |
| download | rust-libc-e507572650a7d4d70c351abff8ee1dc6274c0550.tar.gz | |
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 https://github.com/rust-lang/libc/pull/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)
| -rw-r--r-- | src/unix/bsd/apple/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 8c30eb2de3..d17d5e0050 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -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; |