Address clippy lints

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Sep 18, 2024 · 2f37ea4 · 2f37ea4
1 parent b6034c8
commit 2f37ea4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -467,6 +467,7 @@ impl<T: AsRef<[u8]>> ByteIO<ReadOnly> for SliceByteIO<T> {
             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
@@ -44,6 +44,7 @@ pub trait MutexSyncOps {
 unsafe impl<O: MutexSyncOps> lock_api::RawMutex for GenericRawMutex<O> {
     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
@@ -19,9 +19,8 @@ fn get_asserting_valid_unicode(var: &str) -> Option<String> {
             }
         })
         .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<Item = PathBuf> {
         .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
         })
 }