Skip to content

Commit c6176ac

Browse files
committed
misc: make clippy happy
1 parent e5d85ee commit c6176ac

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

raw_struct/src/copy.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ impl<T: SizedViewable> Copy<T> {
5757
memory: &M,
5858
offset: u64,
5959
) -> Result<Self, M::AccessError> {
60-
let mut copy_memory = unsafe { MaybeUninit::<T::Memory>::uninit().assume_init() };
60+
let mut copy_memory = MaybeUninit::<T::Memory>::uninit();
6161
memory.read_memory(offset, unsafe {
6262
slice::from_raw_parts_mut(
63-
&mut copy_memory as *mut _ as *mut u8,
63+
copy_memory.as_mut_ptr() as *mut u8,
6464
mem::size_of::<T::Memory>(),
6565
)
6666
})?;
6767

68-
Ok(Self::new(copy_memory))
68+
Ok(Self::new(unsafe { copy_memory.assume_init() }))
6969
}
7070

7171
pub fn as_reference(&self) -> Reference<T, &CopyMemory<T::Memory>> {

raw_struct/src/memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl<M: MemoryView> MemoryView for &M {
2323
type AccessError = M::AccessError;
2424

2525
fn read_memory(&self, offset: u64, buffer: &mut [u8]) -> Result<(), Self::AccessError> {
26-
M::read_memory(&self, offset, buffer)
26+
M::read_memory(self, offset, buffer)
2727
}
2828
}
2929

raw_struct/tests/raw_dummy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl<T> Viewable for MyTypedStruct<T> {
112112
fn from_memory<M: MemoryView>(memory: M) -> Self::Implementation<M> {
113113
MyTypedStruct {
114114
memory,
115-
_type: PhantomData::default(),
115+
_type: Default::default(),
116116
}
117117
}
118118
}

raw_struct_derive/src/derive_raw_struct.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,11 @@ pub fn raw_struct(attr: TokenStream, input: TokenStream) -> Result<TokenStream>
355355
None
356356
};
357357

358-
let sized_impl = if let Some(memory) = args.memory {
359-
Some(quote! {
360-
impl #vanilla_impl_generics raw_struct::SizedViewable for #struct_name #vanilla_ty_generics #vanilla_where_clause {
361-
type Memory = #memory;
362-
}
363-
})
364-
} else {
365-
None
366-
};
358+
let sized_impl = args.memory.map(|memory| quote! {
359+
impl #vanilla_impl_generics raw_struct::SizedViewable for #struct_name #vanilla_ty_generics #vanilla_where_clause {
360+
type Memory = #memory;
361+
}
362+
});
367363

368364
Ok(quote! {
369365
#struct_def

0 commit comments

Comments
 (0)