diff --git a/src/header/grp/mod.rs b/src/header/grp/mod.rs index e2728671ae..04a8679073 100644 --- a/src/header/grp/mod.rs +++ b/src/header/grp/mod.rs @@ -129,9 +129,9 @@ fn split(buf: &mut [u8]) -> Option { // We moved the gid to the beginning of the byte buffer so we can do this. let mut parts = buf[mem::size_of::()..].split_mut(|&c| c == b'\0'); - let gr_name = parts.next()?.as_mut_ptr() as *mut c_char; - let gr_passwd = parts.next()?.as_mut_ptr() as *mut c_char; - let gr_mem = parts.next()?.as_mut_ptr() as *mut usize; + let gr_name = parts.next()?.as_mut_ptr().cast::(); + let gr_passwd = parts.next()?.as_mut_ptr().cast::(); + let gr_mem = parts.next()?.as_mut_ptr().cast::(); // Adjust gr_mem address by buffer base address // TODO: max group members length? @@ -149,7 +149,7 @@ fn split(buf: &mut [u8]) -> Option { gr_name, gr_passwd, gr_gid, - gr_mem: gr_mem as *mut *mut c_char, + gr_mem: gr_mem.cast::<*mut c_char>(), }) } @@ -169,9 +169,9 @@ fn parse_grp(line: String, destbuf: Option) -> Result() - .map_err(|err| Error::ParseIntError(err))?; + .map_err(Error::ParseIntError)?; // Place the gid at the beginning of the byte buffer to make getting it back out again later, much faster. @@ -327,7 +327,7 @@ pub unsafe extern "C" fn getgrgid_r( let grp = match parse_grp( line, Some(DestBuffer { - ptr: buffer as *mut u8, + ptr: buffer.cast::(), len: buflen, }), ) { @@ -383,7 +383,7 @@ pub unsafe extern "C" fn getgrnam_r( let Ok(grp) = parse_grp( line, Some(DestBuffer { - ptr: buffer as *mut u8, + ptr: buffer.cast::(), len: buflen, }), ) else { @@ -508,7 +508,7 @@ pub unsafe extern "C" fn getgrouplist( .map(|i| i.trim()) .collect::>(); - if !members.iter().any(|i| *i == user) { + if !members.contains(&user) { continue; } diff --git a/src/header/inttypes/mod.rs b/src/header/inttypes/mod.rs index 08e38807e5..d4abdc9b9d 100644 --- a/src/header/inttypes/mod.rs +++ b/src/header/inttypes/mod.rs @@ -42,8 +42,8 @@ pub unsafe extern "C" fn strtoimax( strto_impl!( intmax_t, false, - intmax_t::max_value(), - intmax_t::min_value(), + intmax_t::MAX, + intmax_t::MIN, s, endptr, base @@ -60,8 +60,8 @@ pub unsafe extern "C" fn strtoumax( strto_impl!( uintmax_t, false, - uintmax_t::max_value(), - uintmax_t::min_value(), + uintmax_t::MAX, + uintmax_t::MIN, s, endptr, base diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs index db3c8368b7..bb5d491321 100644 --- a/src/platform/redox/mod.rs +++ b/src/platform/redox/mod.rs @@ -6,7 +6,6 @@ use core::{ }; use redox_rt::{ RtTcb, - proc::*, protocol::{WaitFlags, wifstopped}, sys::{Resugid, WaitpidTarget}, }; @@ -312,7 +311,7 @@ impl Pal for Sys { // TODO: Find way to avoid lock. let _guard = CLONE_LOCK.write(); - Ok(fork_impl(&redox_rt::proc::ForkArgs::Managed)? as pid_t) + Ok(redox_rt::proc::fork_impl(&redox_rt::proc::ForkArgs::Managed)? as pid_t) } fn fstat(fildes: c_int, mut buf: Out) -> Result<()> {