entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: remove unnecessary mem:: prefix

Browse source
This commit is contained in:
Julian Orth 2024-10-12 14:49:37 +02:00
parent c00ef63afe
commit 1e45a243de
22 changed files with 61 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pipewire/pw_ifs/pw_client_node.rs
View file

@ -40,7 +40,6 @@ use {
},
std::{
cell::{Cell, RefCell},
mem,
rc::Rc,
sync::atomic::Ordering::{Relaxed, Release},
},
@ -326,13 +325,13 @@ impl PwClientNode {
let sm = port.supported_metas.get();
let mut metas = vec![];
if sm.contains(SUPPORTED_META_HEADER) {
metas.push((SPA_META_Header, mem::size_of::<spa_meta_header>()));
metas.push((SPA_META_Header, size_of::<spa_meta_header>()));
}
if sm.contains(SUPPORTED_META_BUSY) {
metas.push((SPA_META_Busy, mem::size_of::<spa_meta_busy>()));
metas.push((SPA_META_Busy, size_of::<spa_meta_busy>()));
}
if sm.contains(SUPPORTED_META_VIDEO_CROP) {
metas.push((SPA_META_VideoCrop, mem::size_of::<spa_meta_region>()));
metas.push((SPA_META_VideoCrop, size_of::<spa_meta_region>()));
}
let sf = &*port.supported_formats.borrow();
let num_formats = sf.formats.len() as u32;

6
src/pipewire/pw_mem.rs
View file

@ -6,7 +6,7 @@ use {
page_size::page_size,
ptr_ext::{MutPtrExt, PtrExt},
},
std::{marker::PhantomData, mem, ops::Range, rc::Rc},
std::{marker::PhantomData, ops::Range, rc::Rc},
thiserror::Error,
uapi::{c, OwnedFd, Pod},
};
@ -107,8 +107,8 @@ impl PwMemMap {
fn check<T>(&self, offset: usize) {
assert!(offset <= self.range.len());
assert!(mem::size_of::<T>() <= self.range.len() - offset);
assert_eq!((mem::align_of::<T>() - 1) & (self.range.start + offset), 0);
assert!(size_of::<T>() <= self.range.len() - offset);
assert_eq!((align_of::<T>() - 1) & (self.range.start + offset), 0);
}
pub fn typed<T: Pod>(self: &Rc<Self>) -> Rc<PwMemTyped<T>> {

10
src/pipewire/pw_parser.rs
View file

@ -12,11 +12,7 @@ use {
},
ahash::AHashMap,
bstr::{BStr, BString, ByteSlice},
std::{
fmt::Debug,
mem::{self, MaybeUninit},
rc::Rc,
},
std::{fmt::Debug, mem::MaybeUninit, rc::Rc},
thiserror::Error,
uapi::{OwnedFd, Pod},
};
@ -52,11 +48,11 @@ impl<'a> PwParser<'a> {
}
fn read_raw<T: Pod>(&mut self, offset: usize) -> Result<T, PwParserError> {
if self.pos + offset + mem::size_of::<T>() <= self.data.len() {
if self.pos + offset + size_of::<T>() <= self.data.len() {
unsafe {
let mut res = MaybeUninit::uninit();
let src = self.data[self.pos + offset..].as_ptr();
std::ptr::copy_nonoverlapping(src, res.as_mut_ptr() as _, mem::size_of::<T>());
std::ptr::copy_nonoverlapping(src, res.as_mut_ptr() as _, size_of::<T>());
Ok(res.assume_init())
}
} else {