From 2f37ea41c4732812c0442ba8dabbff2e15ea85dc Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 10 Sep 2024 01:36:28 -0700 Subject: [PATCH] Address clippy lints Signed-off-by: Nick Spinale --- crates/examples/root-task/serial-device/src/main.rs | 4 ++-- .../examples/root-task/spawn-task/child/src/runtime.rs | 9 ++++----- crates/examples/root-task/spawn-task/src/main.rs | 4 ++-- crates/examples/root-task/spawn-thread/src/main.rs | 2 +- crates/sel4-async/block-io/src/lib.rs | 1 + crates/sel4-sync/src/mutex.rs | 1 + crates/sel4/build-env/src/lib.rs | 9 +++------ 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/crates/examples/root-task/serial-device/src/main.rs b/crates/examples/root-task/serial-device/src/main.rs index cbdba1f3e..5fa3f06d6 100644 --- a/crates/examples/root-task/serial-device/src/main.rs +++ b/crates/examples/root-task/serial-device/src/main.rs @@ -189,7 +189,7 @@ struct FreePagePlaceHolder(#[allow(dead_code)] [u8; GRANULE_SIZE]); static mut FREE_PAGE_PLACEHOLDER: FreePagePlaceHolder = FreePagePlaceHolder([0; GRANULE_SIZE]); fn init_free_page_addr(bootinfo: &sel4::BootInfo) -> usize { - let addr = unsafe { ptr::addr_of!(FREE_PAGE_PLACEHOLDER) as usize }; + let addr = ptr::addr_of!(FREE_PAGE_PLACEHOLDER) as usize; get_user_image_frame_slot(bootinfo, addr) .cap() .frame_unmap() @@ -204,7 +204,7 @@ fn get_user_image_frame_slot( extern "C" { static __executable_start: usize; } - let user_image_addr = unsafe { ptr::addr_of!(__executable_start) as usize }; + let user_image_addr = ptr::addr_of!(__executable_start) as usize; bootinfo .user_image_frames() .index(addr / GRANULE_SIZE - user_image_addr / GRANULE_SIZE) diff --git a/crates/examples/root-task/spawn-task/child/src/runtime.rs b/crates/examples/root-task/spawn-task/child/src/runtime.rs index 4779aacc4..86876a073 100644 --- a/crates/examples/root-task/spawn-task/child/src/runtime.rs +++ b/crates/examples/root-task/spawn-task/child/src/runtime.rs @@ -51,6 +51,7 @@ fn inner_entry() -> ! { } match catch_unwind(main) { + #[allow(unreachable_patterns)] Ok(never) => never, Err(_) => abort!("main() panicked"), } @@ -60,9 +61,7 @@ fn get_ipc_buffer() -> *mut sel4::IpcBuffer { extern "C" { static _end: usize; } - unsafe { - (ptr::addr_of!(_end) as usize) - .next_multiple_of(sel4::cap_type::Granule::FRAME_OBJECT_TYPE.bytes()) - as *mut sel4::IpcBuffer - } + (ptr::addr_of!(_end) as usize) + .next_multiple_of(sel4::cap_type::Granule::FRAME_OBJECT_TYPE.bytes()) + as *mut sel4::IpcBuffer } diff --git a/crates/examples/root-task/spawn-task/src/main.rs b/crates/examples/root-task/spawn-task/src/main.rs index 3419c80f8..5f31144bf 100644 --- a/crates/examples/root-task/spawn-task/src/main.rs +++ b/crates/examples/root-task/spawn-task/src/main.rs @@ -100,7 +100,7 @@ struct FreePagePlaceHolder(#[allow(dead_code)] [u8; GRANULE_SIZE]); static mut FREE_PAGE_PLACEHOLDER: FreePagePlaceHolder = FreePagePlaceHolder([0; GRANULE_SIZE]); fn init_free_page_addr(bootinfo: &sel4::BootInfo) -> usize { - let addr = unsafe { ptr::addr_of!(FREE_PAGE_PLACEHOLDER) as usize }; + let addr = ptr::addr_of!(FREE_PAGE_PLACEHOLDER) as usize; get_user_image_frame_slot(bootinfo, addr) .cap() .frame_unmap() @@ -115,7 +115,7 @@ fn get_user_image_frame_slot( extern "C" { static __executable_start: usize; } - let user_image_addr = unsafe { ptr::addr_of!(__executable_start) as usize }; + let user_image_addr = ptr::addr_of!(__executable_start) as usize; bootinfo .user_image_frames() .index(addr / GRANULE_SIZE - user_image_addr / GRANULE_SIZE) diff --git a/crates/examples/root-task/spawn-thread/src/main.rs b/crates/examples/root-task/spawn-thread/src/main.rs index 67fb6c5cf..dd6e0c35d 100644 --- a/crates/examples/root-task/spawn-thread/src/main.rs +++ b/crates/examples/root-task/spawn-thread/src/main.rs @@ -282,7 +282,7 @@ fn get_user_image_frame_slot( extern "C" { static __executable_start: usize; } - let user_image_addr = unsafe { ptr::addr_of!(__executable_start) as usize }; + let user_image_addr = ptr::addr_of!(__executable_start) as usize; bootinfo .user_image_frames() .index(addr / GRANULE_SIZE - user_image_addr / GRANULE_SIZE) diff --git a/crates/sel4-async/block-io/src/lib.rs b/crates/sel4-async/block-io/src/lib.rs index c1fa5d462..049b2eaa0 100644 --- a/crates/sel4-async/block-io/src/lib.rs +++ b/crates/sel4-async/block-io/src/lib.rs @@ -467,6 +467,7 @@ impl> ByteIO for SliceByteIO { Operation::Read { buf, .. } => { buf.copy_from_slice(&self.inner().as_ref()[offset..][..buf.len()]); } + #[allow(unreachable_patterns)] Operation::Write { witness, .. } => witness.absurd(), } Ok(()) diff --git a/crates/sel4-sync/src/mutex.rs b/crates/sel4-sync/src/mutex.rs index bbeb260e2..a4ca067c6 100644 --- a/crates/sel4-sync/src/mutex.rs +++ b/crates/sel4-sync/src/mutex.rs @@ -44,6 +44,7 @@ pub trait MutexSyncOps { unsafe impl lock_api::RawMutex for GenericRawMutex { type GuardMarker = lock_api::GuardNoSend; // TODO + #[allow(clippy::declare_interior_mutable_const)] const INIT: Self = unimplemented!(); fn lock(&self) { diff --git a/crates/sel4/build-env/src/lib.rs b/crates/sel4/build-env/src/lib.rs index 42b51d6b2..f3ebda9b1 100644 --- a/crates/sel4/build-env/src/lib.rs +++ b/crates/sel4/build-env/src/lib.rs @@ -19,9 +19,8 @@ fn get_asserting_valid_unicode(var: &str) -> Option { } }) .ok() - .map(|val| { + .inspect(|_| { println!("cargo:rerun-if-env-changed={var}"); - val }) } @@ -40,9 +39,8 @@ pub fn try_get_with_sel4_prefix_relative_fallback( get_asserting_valid_unicode(var) .map(PathBuf::from) .or_else(|| get_sel4_prefix().map(|fallback| fallback.join(relative_path_from_fallback))) - .map(|path| { + .inspect(|path| { println!("cargo:rerun-if-changed={}", path.display()); - path }) } @@ -56,9 +54,8 @@ pub fn get_libsel4_include_dirs() -> impl Iterator { .or_else(|| get_sel4_prefix().map(|sel4_prefix| vec![sel4_prefix.join("libsel4/include")])) .unwrap_or_else(|| panic!("{SEL4_INCLUDE_DIRS_ENV} or {SEL4_PREFIX_ENV} must be set")) .into_iter() - .map(|path| { + .inspect(|path| { println!("cargo:rerun-if-changed={}", path.display()); - path }) }