vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

size_of and align_of are part of the prelude nowadays

Browse Source
This commit is contained in:
bjorn3
2026-04-06 15:19:52 +02:00
committed by Jeremy Soller
parent 2e784dfe46
commit 654ee6ca3e
42 changed files with 137 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sync/wait_queue.rs
+6 -8
View File
@@ -46,7 +46,7 @@ impl<T> WaitQueue<T> {
continue;
} else if buf.is_empty() {
return Ok(0);
} else if buf.len() < core::mem::size_of::<T>() {
} else if buf.len() < size_of::<T>() {
return Err(Error::new(EINVAL));
} else {
// TODO: EWOULDBLOCK?
@@ -55,12 +55,10 @@ impl<T> WaitQueue<T> {
}
let (s1, s2) = inner.as_slices();
let s1_bytes = unsafe {
core::slice::from_raw_parts(s1.as_ptr().cast::<u8>(), core::mem::size_of_val(s1))
};
let s2_bytes = unsafe {
core::slice::from_raw_parts(s2.as_ptr().cast::<u8>(), core::mem::size_of_val(s2))
};
let s1_bytes =
unsafe { core::slice::from_raw_parts(s1.as_ptr().cast::<u8>(), size_of_val(s1)) };
let s2_bytes =
unsafe { core::slice::from_raw_parts(s2.as_ptr().cast::<u8>(), size_of_val(s2)) };
let mut bytes_copied = buf.copy_common_bytes_from_slice(s1_bytes)?;
@@ -68,7 +66,7 @@ impl<T> WaitQueue<T> {
bytes_copied += buf_for_s2.copy_common_bytes_from_slice(s2_bytes)?;
}
let _ = inner.drain(..bytes_copied / core::mem::size_of::<T>());
let _ = inner.drain(..bytes_copied / size_of::<T>());
return Ok(bytes_copied);
}