From 05ca218c99096bb733ddf5530adceeca7da07a66 Mon Sep 17 00:00:00 2001 From: DemonInTheCloset Date: Sun, 11 Sep 2022 16:50:11 +0200 Subject: [PATCH 1/2] fix(clippy): Fix Simple clippy warnings --- playground/src/main.rs | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/playground/src/main.rs b/playground/src/main.rs index fcc101d..c70e108 100644 --- a/playground/src/main.rs +++ b/playground/src/main.rs @@ -42,6 +42,7 @@ impl GPUWeakPointer { } #[repr(transparent)] +#[allow(dead_code)] struct GPURawPointer(NonZeroU64); #[macro_export] @@ -118,7 +119,7 @@ impl GPUObject { } } -impl<'a, T: GPUStruct + Debug> Debug for GPUObject { +impl Debug for GPUObject { fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> { f.debug_struct(core::any::type_name::()) .field("raw", &format_args!("{:#X?}", &self.raw)) @@ -144,16 +145,19 @@ impl GPUArray { GPUPointer(self.gpu_ptr, PhantomData) } + #[allow(dead_code)] fn len(&self) -> usize { (*self.raw).len() } + #[allow(dead_code)] fn as_slice(&self) -> &[T] { - &*self.raw + &self.raw } + #[allow(dead_code)] fn as_mut_slice(&mut self) -> &mut [T] { - &mut *self.raw + &mut self.raw } } @@ -163,7 +167,7 @@ impl Drop for GPUObject { } } -impl<'a, T: Copy + Debug> Debug for GPUArray { +impl Debug for GPUArray { fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> { f.debug_struct(core::any::type_name::()) .field("array", &format_args!("{:#X?}", &self.raw)) @@ -200,6 +204,7 @@ struct RawBufferManagerInfo<'a> { #[versions(AGX)] #[derive(Debug)] struct BufferManagerInfo { + #[allow(dead_code)] block_control: GPUObject, } @@ -220,7 +225,9 @@ struct RawTAJob<'a> { #[versions(AGX)] #[derive(Debug)] struct TAJob { + #[allow(dead_code)] buffer_mgr: Arc>, + #[allow(dead_code)] micro_sequence: GPUMicroSequence, } @@ -266,28 +273,30 @@ impl SomeOp { impl GPUMSOp for SomeOp {} +#[allow(dead_code)] #[versions(AGX)] struct GPUDriver {} +#[allow(dead_code)] #[versions(AGX)] impl GPUDriver::ver { fn run() { - let mut ctl = GPUObject::new(BufferManagerBlockControl {}, |inner| { + let ctl = GPUObject::new(BufferManagerBlockControl {}, |_inner| { RawBufferManagerBlockControl { total: AtomicU32::new(0), ..Default::default() } }); - let mut ctl2 = - GPUObject::::new(BufferManagerBlockControl {}, |inner| { + let ctl2 = + GPUObject::::new(BufferManagerBlockControl {}, |_inner| { RawBufferManagerBlockControl { total: AtomicU32::new(0), ..Default::default() } }); - dbg!(ctl2); + dbg!(&ctl2); let mut mgr = GPUObject::::new( BufferManagerInfo::ver { block_control: ctl }, @@ -305,14 +314,14 @@ impl GPUDriver::ver { mgr.with_mut(|raw, inner| { raw.gpu_counter = 2; - inner.block_control.with(|raw, inner| { + inner.block_control.with(|raw, _inner| { raw.total.fetch_add(1, Ordering::Relaxed); }); }); let arc = Arc::new(mgr); - let mut ta = GPUObject::::new_prealloc( + let ta = GPUObject::::new_prealloc( |p| { let mut ms = GPUMicroSequenceBuilder::new(); ms.add(SomeOp { @@ -331,8 +340,8 @@ impl GPUDriver::ver { }, ); - arc.with(|raw, inner| { - inner.block_control.with(|raw, inner| { + arc.with(|_raw, inner| { + inner.block_control.with(|raw, _inner| { raw.total.fetch_add(1, Ordering::Relaxed); }); }); From b5f272faa2ce708ad52383365a573fce2dfaf0fc Mon Sep 17 00:00:00 2001 From: DemonInTheCloset Date: Sun, 11 Sep 2022 16:52:12 +0200 Subject: [PATCH 2/2] fix(boxed_vec): Generally a Vec shouldn't be boxed --- playground/src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/playground/src/main.rs b/playground/src/main.rs index c70e108..8522dbc 100644 --- a/playground/src/main.rs +++ b/playground/src/main.rs @@ -129,14 +129,14 @@ impl Debug for GPUObject { } struct GPUArray { - raw: Box>, + raw: Vec, gpu_ptr: NonZeroU64, } impl GPUArray { fn new(data: Vec) -> GPUArray { GPUArray:: { - raw: Box::new(data), + raw: data, gpu_ptr: NonZeroU64::new(1).unwrap(), } } @@ -147,7 +147,7 @@ impl GPUArray { #[allow(dead_code)] fn len(&self) -> usize { - (*self.raw).len() + self.raw.len() } #[allow(dead_code)]