diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs index 51abedcb8fc10..20bf7401e570f 100644 --- a/src/fuchsia/mod.rs +++ b/src/fuchsia/mod.rs @@ -3076,9 +3076,9 @@ f! { pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr { if ((*cmsg).cmsg_len as size_t) < size_of::() { - core::ptr::null_mut::() + ptr::null_mut() } else if __CMSG_NEXT(cmsg).add(size_of::()) >= __MHDR_END(mhdr) { - core::ptr::null_mut::() + ptr::null_mut() } else { __CMSG_NEXT(cmsg).cast() } @@ -3088,7 +3088,7 @@ f! { if (*mhdr).msg_controllen as size_t >= size_of::() { (*mhdr).msg_control.cast() } else { - core::ptr::null_mut::() + ptr::null_mut() } } diff --git a/src/new/qurt/mod.rs b/src/new/qurt/mod.rs index 52d7ae04881e1..41ce4b50ba0ac 100644 --- a/src/new/qurt/mod.rs +++ b/src/new/qurt/mod.rs @@ -236,7 +236,7 @@ pub const FOPEN_MAX: c_uint = 20; pub const EOK: c_int = 0; // Semaphore constants -pub const SEM_FAILED: *mut sem_t = 0 as *mut sem_t; +pub const SEM_FAILED: *mut sem_t = ptr::null_mut(); // Page size constants (hexagon-specific) pub const PAGESIZE: size_t = 4096; diff --git a/src/unix/aix/mod.rs b/src/unix/aix/mod.rs index 987eadf2465cc..04df0b6ba336d 100644 --- a/src/unix/aix/mod.rs +++ b/src/unix/aix/mod.rs @@ -2415,7 +2415,7 @@ f! { if (*mhdr).msg_controllen as usize >= size_of::() { (*mhdr).msg_control as *mut cmsghdr } else { - core::ptr::null_mut::() + ptr::null_mut() } } @@ -2426,7 +2426,7 @@ f! { if (cmsg as usize + (*cmsg).cmsg_len as usize + size_of::()) > ((*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize) { - core::ptr::null_mut::() + ptr::null_mut() } else { // AIX does not have any alignment/padding for ancillary data, so we don't need _CMSG_ALIGN here. (cmsg as usize + (*cmsg).cmsg_len as usize) as *mut cmsghdr diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 69321b7086f74..78c93a84a66c6 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -4068,7 +4068,7 @@ f! { let next = cmsg as usize + __DARWIN_ALIGN32(cmsg_len); let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if next + __DARWIN_ALIGN32(size_of::()) > max { - core::ptr::null_mut() + ptr::null_mut() } else { next as *mut cmsghdr } diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs index 386da7de3279d..22cb415f9b552 100644 --- a/src/unix/bsd/freebsdlike/dragonfly/mod.rs +++ b/src/unix/bsd/freebsdlike/dragonfly/mod.rs @@ -1191,7 +1191,7 @@ f! { if next <= max { (cmsg as usize + _CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr } else { - core::ptr::null_mut::() + ptr::null_mut() } } diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 3a3f8076bb51e..af0a1b7558ec8 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -4198,7 +4198,7 @@ f! { let next = cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(size_of::()); let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if next > max { - core::ptr::null_mut::() + ptr::null_mut() } else { (cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr } diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs index 74a6fa8142b27..e890388032bdf 100644 --- a/src/unix/bsd/mod.rs +++ b/src/unix/bsd/mod.rs @@ -497,7 +497,7 @@ f! { if (*mhdr).msg_controllen as usize >= size_of::() { (*mhdr).msg_control.cast::() } else { - core::ptr::null_mut() + ptr::null_mut() } } diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index 50e45dbebe737..e1deca9e387b2 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -1330,20 +1330,20 @@ cfg_if! { ptm_pad1: Padding::new([0; 3]), ptm_unused: Padding::new(0), ptm_pad2: Padding::new([0; 3]), - ptm_waiters: 0 as *mut _, + ptm_waiters: ptr::null_mut(), ptm_owner: 0, ptm_recursed: 0, - ptm_spare2: 0 as *mut _, + ptm_spare2: ptr::null_mut(), }; } else { pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { ptm_magic: 0x33330003, ptm_errorcheck: 0, ptm_unused: Padding::new(0), - ptm_waiters: 0 as *mut _, + ptm_waiters: ptr::null_mut(), ptm_owner: 0, ptm_recursed: 0, - ptm_spare2: 0 as *mut _, + ptm_spare2: ptr::null_mut(), }; } } @@ -1351,21 +1351,21 @@ cfg_if! { pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { ptc_magic: 0x55550005, ptc_lock: 0, - ptc_waiters_first: 0 as *mut _, - ptc_waiters_last: 0 as *mut _, - ptc_mutex: 0 as *mut _, - ptc_private: 0 as *mut _, + ptc_waiters_first: ptr::null_mut(), + ptc_waiters_last: ptr::null_mut(), + ptc_mutex: ptr::null_mut(), + ptc_private: ptr::null_mut(), }; pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t { ptr_magic: 0x99990009, ptr_interlock: 0, - ptr_rblocked_first: 0 as *mut _, - ptr_rblocked_last: 0 as *mut _, - ptr_wblocked_first: 0 as *mut _, - ptr_wblocked_last: 0 as *mut _, + ptr_rblocked_first: ptr::null_mut(), + ptr_rblocked_last: ptr::null_mut(), + ptr_wblocked_first: ptr::null_mut(), + ptr_wblocked_last: ptr::null_mut(), ptr_nreaders: 0, ptr_owner: 0, - ptr_private: 0 as *mut _, + ptr_private: ptr::null_mut(), }; pub const PTHREAD_MUTEX_NORMAL: c_int = 0; pub const PTHREAD_MUTEX_ERRORCHECK: c_int = 1; @@ -1824,7 +1824,7 @@ f! { let next = cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(size_of::()); let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if next > max { - core::ptr::null_mut::() + ptr::null_mut() } else { (cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr } diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs index e642ef18ebc27..3fd9c3ede615f 100644 --- a/src/unix/bsd/netbsdlike/openbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsd/mod.rs @@ -1836,7 +1836,7 @@ f! { let next = cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(size_of::()); let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if next > max { - core::ptr::null_mut::() + ptr::null_mut() } else { (cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr } diff --git a/src/unix/cygwin/mod.rs b/src/unix/cygwin/mod.rs index 56ee0a5d105e7..2ca5232ad4168 100644 --- a/src/unix/cygwin/mod.rs +++ b/src/unix/cygwin/mod.rs @@ -1020,7 +1020,7 @@ pub const LC_TIME_MASK: c_int = 1 << 5; pub const LC_MESSAGES_MASK: c_int = 1 << 6; pub const LC_GLOBAL_LOCALE: locale_t = -1isize as locale_t; -pub const SEM_FAILED: *mut sem_t = core::ptr::null_mut(); +pub const SEM_FAILED: *mut sem_t = ptr::null_mut(); pub const ST_RDONLY: c_ulong = 0x80000; pub const ST_NOSUID: c_ulong = 0; @@ -1759,7 +1759,7 @@ f! { if (*mhdr).msg_controllen as usize >= size_of::() { (*mhdr).msg_control.cast() } else { - core::ptr::null_mut() + ptr::null_mut() } } @@ -1767,7 +1767,7 @@ f! { let next = (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr; let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if next as usize + CMSG_ALIGN(size_of::()) as usize > max { - core::ptr::null_mut() + ptr::null_mut() } else { next } diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs index 8fae6f704d357..fda817ea7df65 100644 --- a/src/unix/haiku/mod.rs +++ b/src/unix/haiku/mod.rs @@ -1097,7 +1097,7 @@ pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { flags: 0, unused: Padding::new(0), - mutex: 0 as *mut _, + mutex: ptr::null_mut(), waiter_count: 0, lock: 0, }; @@ -1108,7 +1108,7 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t { lock_count: 0, reader_count: 0, writer_count: 0, - waiters: [0 as *mut _; 2], + waiters: [ptr::null_mut(); 2], }; pub const PTHREAD_MUTEX_DEFAULT: c_int = 0; @@ -1385,7 +1385,7 @@ f! { if (*mhdr).msg_controllen as usize >= size_of::() { (*mhdr).msg_control as *mut cmsghdr } else { - core::ptr::null_mut::() + ptr::null_mut() } } @@ -1410,7 +1410,7 @@ f! { + CMSG_ALIGN(size_of::()); let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if next > max { - core::ptr::null_mut::() + ptr::null_mut() } else { (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr } diff --git a/src/unix/haiku/native.rs b/src/unix/haiku/native.rs index 99ceab8a7519b..9c86f72638a3c 100644 --- a/src/unix/haiku/native.rs +++ b/src/unix/haiku/native.rs @@ -905,7 +905,7 @@ pub const B_XATTR_TYPE: u32 = haiku_constant!('X', 'A', 'T', 'R'); pub const B_NETWORK_ADDRESS_TYPE: u32 = haiku_constant!('N', 'W', 'A', 'D'); pub const B_MIME_STRING_TYPE: u32 = haiku_constant!('M', 'I', 'M', 'S'); pub const B_ASCII_TYPE: u32 = haiku_constant!('T', 'E', 'X', 'T'); -pub const B_APP_IMAGE_SYMBOL: *const c_void = core::ptr::null(); +pub const B_APP_IMAGE_SYMBOL: *const c_void = ptr::null(); extern "C" { // kernel/OS.h diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs index af86822c634b3..73778e4ec045a 100644 --- a/src/unix/hurd/mod.rs +++ b/src/unix/hurd/mod.rs @@ -3336,19 +3336,19 @@ pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { }; pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { __lock: __PTHREAD_SPIN_LOCK_INITIALIZER, - __queue: 0i64 as *mut __pthread, - __attr: 0i64 as *mut __pthread_condattr, + __queue: ptr::null_mut(), + __attr: ptr::null_mut(), __wrefs: 0, - __data: 0i64 as *mut c_void, + __data: ptr::null_mut(), }; pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t { __held: __PTHREAD_SPIN_LOCK_INITIALIZER, __lock: __PTHREAD_SPIN_LOCK_INITIALIZER, __readers: 0, - __readerqueue: 0i64 as *mut __pthread, - __writerqueue: 0i64 as *mut __pthread, - __attr: 0i64 as *mut __pthread_rwlockattr, - __data: 0i64 as *mut c_void, + __readerqueue: ptr::null_mut(), + __writerqueue: ptr::null_mut(), + __attr: ptr::null_mut(), + __data: ptr::null_mut(), }; pub const PTHREAD_STACK_MIN: size_t = 0; @@ -3365,7 +3365,7 @@ f! { if (*mhdr).msg_controllen as usize >= size_of::() { (*mhdr).msg_control.cast::() } else { - core::ptr::null_mut::() + ptr::null_mut() } } @@ -3383,14 +3383,14 @@ f! { pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr { if ((*cmsg).cmsg_len as usize) < size_of::() { - return core::ptr::null_mut::(); + return ptr::null_mut(); } let next = (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr; let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if (next.offset(1)) as usize > max || next as usize + CMSG_ALIGN((*next).cmsg_len as usize) > max { - core::ptr::null_mut::() + ptr::null_mut() } else { next.cast::() } diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index 6a2f1bcf8cf51..caa55c68bfccc 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -3283,7 +3283,7 @@ f! { let next = (cmsg as usize + super::CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr; let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if (next.offset(1)) as usize > max { - core::ptr::null_mut::() + ptr::null_mut() } else { next as *mut cmsghdr } diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs index a97e772f99e75..4d67d55ffdc50 100644 --- a/src/unix/linux_like/emscripten/mod.rs +++ b/src/unix/linux_like/emscripten/mod.rs @@ -1253,12 +1253,12 @@ pub const SOMAXCONN: c_int = 128; f! { pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr { if ((*cmsg).cmsg_len as usize) < size_of::() { - return core::ptr::null_mut::(); + return ptr::null_mut(); } let next = (cmsg as usize + super::CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr; let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if (next.offset(1)) as usize >= max { - core::ptr::null_mut::() + ptr::null_mut() } else { next as *mut cmsghdr } diff --git a/src/unix/linux_like/l4re/uclibc/mod.rs b/src/unix/linux_like/l4re/uclibc/mod.rs index e593ad76d4fc2..b3dba2c37766c 100644 --- a/src/unix/linux_like/l4re/uclibc/mod.rs +++ b/src/unix/linux_like/l4re/uclibc/mod.rs @@ -456,7 +456,7 @@ pub const __LOCK_INITIALIZER: _pthread_fastlock = _pthread_fastlock { pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { __m_reserved: 0, __m_count: 0, - __m_owner: core::ptr::null_mut(), + __m_owner: ptr::null_mut(), __m_kind: PTHREAD_MUTEX_TIMED_NP, __m_lock: __LOCK_INITIALIZER, }; @@ -468,7 +468,7 @@ const PTHREAD_COND_PADDING_SIZE: usize = 48 pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { __c_lock: __LOCK_INITIALIZER, - __c_waiting: core::ptr::null_mut(), + __c_waiting: ptr::null_mut(), __padding: [0; PTHREAD_COND_PADDING_SIZE], __align: 0, }; @@ -476,9 +476,9 @@ pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t { __rw_lock: __LOCK_INITIALIZER, __rw_readers: 0, - __rw_writer: core::ptr::null_mut(), - __rw_read_waiting: core::ptr::null_mut(), - __rw_write_waiting: core::ptr::null_mut(), + __rw_writer: ptr::null_mut(), + __rw_read_waiting: ptr::null_mut(), + __rw_write_waiting: ptr::null_mut(), __rw_kind: PTHREAD_RWLOCK_DEFAULT_NP, __rw_pshared: crate::PTHREAD_PROCESS_PRIVATE, }; diff --git a/src/unix/linux_like/linux_l4re_shared.rs b/src/unix/linux_like/linux_l4re_shared.rs index 6b320ff4effa2..041e2525d9bc8 100644 --- a/src/unix/linux_like/linux_l4re_shared.rs +++ b/src/unix/linux_like/linux_l4re_shared.rs @@ -1485,7 +1485,7 @@ f! { cmsg: *const crate::cmsghdr, ) -> *mut crate::cmsghdr { if ((*cmsg).cmsg_len as usize) < size_of::() { - return core::ptr::null_mut::(); + return ptr::null_mut(); } // FIXME(msrv): `.wrapping_byte_add()` stabilized in 1.75 @@ -1497,7 +1497,7 @@ f! { // In case the addition wrapped. `next_addr > max_addr` // would otherwise not work as intended. if (next_cmsg as usize) < (cmsg as usize) { - return core::ptr::null_mut(); + return ptr::null_mut(); } let mut max_addr = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; @@ -1510,7 +1510,7 @@ f! { } if next_cmsg as usize + size_of::() > max_addr { - core::ptr::null_mut::() + ptr::null_mut() } else { next_cmsg as *mut crate::cmsghdr } diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs index 7b8397d1c7bad..73c837a92ab78 100644 --- a/src/unix/linux_like/mod.rs +++ b/src/unix/linux_like/mod.rs @@ -1791,7 +1791,7 @@ f! { if (*mhdr).msg_controllen as usize >= size_of::() { (*mhdr).msg_control.cast::() } else { - core::ptr::null_mut::() + ptr::null_mut() } } diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs index 082e48739fe35..0a1f1bf29d14b 100644 --- a/src/unix/nto/mod.rs +++ b/src/unix/nto/mod.rs @@ -2429,7 +2429,7 @@ f! { if (*mhdr).msg_controllen as usize >= size_of::() { (*mhdr).msg_control as *mut cmsghdr } else { - core::ptr::null_mut::() + ptr::null_mut() } } @@ -2437,7 +2437,7 @@ f! { let msg = _CMSG_ALIGN((*cmsg).cmsg_len as usize); let next = cmsg as usize + msg + _CMSG_ALIGN(size_of::()); if next > (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize { - core::ptr::null_mut::() + ptr::null_mut() } else { (cmsg as usize + msg) as *mut cmsghdr } @@ -3145,7 +3145,7 @@ pub unsafe fn atexit(cb: extern "C" fn()) -> c_int { static __dso_handle: *mut c_void; pub fn __cxa_atexit(cb: extern "C" fn(), __arg: *mut c_void, __dso: *mut c_void) -> c_int; } - __cxa_atexit(cb, 0 as *mut c_void, __dso_handle) + __cxa_atexit(cb, ptr::null_mut(), __dso_handle) } impl siginfo_t { diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index ffcc87cba0727..896b1c849294f 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -2220,7 +2220,7 @@ f! { pub fn CMSG_FIRSTHDR(mhdr: *const crate::msghdr) -> *mut cmsghdr { if ((*mhdr).msg_controllen as usize) < size_of::() { - core::ptr::null_mut::() + ptr::null_mut() } else { (*mhdr).msg_control as *mut cmsghdr } @@ -2234,7 +2234,7 @@ f! { _CMSG_HDR_ALIGN(cmsg as usize + (*cmsg).cmsg_len as usize + size_of::()); let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize; if next > max { - core::ptr::null_mut::() + ptr::null_mut() } else { _CMSG_HDR_ALIGN(cmsg as usize + (*cmsg).cmsg_len as usize) as *mut cmsghdr } diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs index 00428543d7aff..769d9f71d0f16 100644 --- a/src/vxworks/mod.rs +++ b/src/vxworks/mod.rs @@ -1,7 +1,5 @@ //! Interface to VxWorks C library -use core::ptr::null_mut; - use crate::prelude::*; extern_ty! { @@ -1333,7 +1331,7 @@ const PTHREAD_MUTEXATTR_INITIALIZER: pthread_mutexattr_t = pthread_mutexattr_t { mutexAttrPshared: 1, }; pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { - mutexSemId: null_mut(), + mutexSemId: ptr::null_mut(), mutexValid: PTHREAD_VALID_OBJ, mutexInitted: PTHREAD_UNUSED_YET_OBJ, mutexCondRefCount: 0, @@ -1348,11 +1346,11 @@ const PTHREAD_CONDATTR_INITIALIZER: pthread_condattr_t = pthread_condattr_t { condAttrClockId: CLOCK_REALTIME, }; pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { - condSemId: null_mut(), + condSemId: ptr::null_mut(), condValid: PTHREAD_VALID_OBJ, condInitted: PTHREAD_UNUSED_YET_OBJ, condRefCount: 0, - condMutex: null_mut(), + condMutex: ptr::null_mut(), condAttr: PTHREAD_CONDATTR_INITIALIZER, condSemName: [0; _PTHREAD_SHARED_SEM_NAME_MAX], }; @@ -1364,7 +1362,7 @@ const PTHREAD_RWLOCKATTR_INITIALIZER: pthread_rwlockattr_t = pthread_rwlockattr_ rwlockAttrConformOpt: 1, }; pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t { - rwlockSemId: null_mut(), + rwlockSemId: ptr::null_mut(), rwlockReadersRefCount: 0, rwlockValid: PTHREAD_VALID_OBJ, rwlockInitted: PTHREAD_UNUSED_YET_OBJ, @@ -1452,7 +1450,7 @@ f! { if next <= max { (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr } else { - core::ptr::null_mut::() + ptr::null_mut() } } @@ -1460,7 +1458,7 @@ f! { if (*mhdr).msg_controllen as usize > 0 { (*mhdr).msg_control as *mut cmsghdr } else { - core::ptr::null_mut::() + ptr::null_mut() } }