From 8d7b86ffb316437fccd111271781678172af2cd5 Mon Sep 17 00:00:00 2001 From: auronandace Date: Thu, 29 Jan 2026 13:07:54 +0000 Subject: [PATCH] remove Copy from RcltAttr --- src/header/pthread/attr.rs | 36 +++++++++++++++++++++++++++--------- src/header/pthread/mod.rs | 2 +- src/pthread/mod.rs | 2 +- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/header/pthread/attr.rs b/src/header/pthread/attr.rs index 7f31d14e94..3902f28868 100644 --- a/src/header/pthread/attr.rs +++ b/src/header/pthread/attr.rs @@ -125,7 +125,9 @@ pub unsafe extern "C" fn pthread_attr_setdetachstate( attr: *mut pthread_attr_t, detachstate: c_int, ) -> c_int { - (unsafe { *attr.cast::() }).detachstate = detachstate as _; + unsafe { + (*attr.cast::()).detachstate = detachstate as _; + } 0 } @@ -134,7 +136,9 @@ pub unsafe extern "C" fn pthread_attr_setguardsize( attr: *mut pthread_attr_t, guardsize: c_int, ) -> c_int { - (unsafe { *attr.cast::() }).guardsize = guardsize as _; + unsafe { + (*attr.cast::()).guardsize = guardsize as _; + } 0 } @@ -143,7 +147,9 @@ pub unsafe extern "C" fn pthread_attr_setinheritsched( attr: *mut pthread_attr_t, inheritsched: c_int, ) -> c_int { - (unsafe { *attr.cast::() }).inheritsched = inheritsched as _; + unsafe { + (*attr.cast::()).inheritsched = inheritsched as _; + } 0 } @@ -152,7 +158,9 @@ pub unsafe extern "C" fn pthread_attr_setschedparam( attr: *mut pthread_attr_t, param: *const sched_param, ) -> c_int { - (unsafe { *attr.cast::() }).param = unsafe { param.read() }; + unsafe { + (*attr.cast::()).param = unsafe { param.read() }; + } 0 } @@ -161,13 +169,17 @@ pub unsafe extern "C" fn pthread_attr_setschedpolicy( attr: *mut pthread_attr_t, policy: c_int, ) -> c_int { - (unsafe { *attr.cast::() }).schedpolicy = policy as u8; + unsafe { + (*attr.cast::()).schedpolicy = policy as u8; + } 0 } #[unsafe(no_mangle)] pub unsafe extern "C" fn pthread_attr_setscope(attr: *mut pthread_attr_t, scope: c_int) -> c_int { - (unsafe { *attr.cast::() }).scope = scope as u8; + unsafe { + (*attr.cast::()).scope = scope as u8; + } 0 } @@ -177,8 +189,12 @@ pub unsafe extern "C" fn pthread_attr_setstack( stackaddr: *mut c_void, stacksize: size_t, ) -> c_int { - (unsafe { *attr.cast::() }).stack = stackaddr as usize; - (unsafe { *attr.cast::() }).stacksize = stacksize; + unsafe { + (*attr.cast::()).stack = stackaddr as usize; + } + unsafe { + (*attr.cast::()).stacksize = stacksize; + } 0 } @@ -187,7 +203,9 @@ pub unsafe extern "C" fn pthread_attr_setstacksize( attr: *mut pthread_attr_t, stacksize: size_t, ) -> c_int { - (unsafe { *attr.cast::() }).stacksize = stacksize; + unsafe { + (*attr.cast::()).stacksize = stacksize; + } 0 } diff --git a/src/header/pthread/mod.rs b/src/header/pthread/mod.rs index e96504551d..ecd5015735 100644 --- a/src/header/pthread/mod.rs +++ b/src/header/pthread/mod.rs @@ -27,7 +27,7 @@ pub fn e(result: Result<(), Errno>) -> i32 { } } -#[derive(Clone, Copy)] +#[derive(Clone)] pub(crate) struct RlctAttr { pub detachstate: c_uchar, pub inheritsched: c_uchar, diff --git a/src/pthread/mod.rs b/src/pthread/mod.rs index de5d92b78a..01dfbc4f7e 100644 --- a/src/pthread/mod.rs +++ b/src/pthread/mod.rs @@ -107,7 +107,7 @@ pub(crate) unsafe fn create( start_routine: extern "C" fn(arg: *mut c_void) -> *mut c_void, arg: *mut c_void, ) -> Result { - let attrs = attrs.copied().unwrap_or_default(); + let attrs = attrs.cloned().unwrap_or_default(); let mut current_sigmask = 0_u64; #[cfg(target_os = "redox")]