clippy

Signed-off-by: Ludvig Liljenberg <[email protected]>

Author: ludfjig

src/hyperlight_common/src/flatbuffer_wrappers/host_function_details.rs

@@ -57,11 +57,8 @@ impl HostFunctionDetails {
     /// Sort the host functions by name.
     #[cfg_attr(feature = "tracing", instrument(skip_all, parent = Span::current(), level= "Trace"))]
     pub fn sort_host_functions_by_name(&mut self) {
-        match &mut self.host_functions {
-            Some(host_functions) => {
-                host_functions.sort_by(|a, b| a.function_name.cmp(&b.function_name))
-            }
-            None => {}
+        if let Some(host_functions) = &mut self.host_functions {
+            host_functions.sort_by(|a, b| a.function_name.cmp(&b.function_name))
         }
     }
 

src/hyperlight_common/src/flatbuffer_wrappers/util.rs

@@ -46,7 +46,6 @@ pub trait FlatbufferSerializable {
 }
 
 /// Implementations for basic types below
-
 impl FlatbufferSerializable for () {
     fn serialize(&self, builder: &mut FlatBufferBuilder) -> FbFunctionCallResultArgs {
         FbFunctionCallResultArgs {

src/hyperlight_host/src/hypervisor/inprocess.rs

@@ -66,7 +66,7 @@ impl Debug for InprocessDriver<'_> {
     }
 }
 
-impl<'a> Hypervisor for InprocessDriver<'a> {
+impl Hypervisor for InprocessDriver<'_> {
     fn initialise(
         &mut self,
         _peb_addr: crate::mem::ptr::RawPtr,

src/hyperlight_host/src/mem/custom_drop.rs

@@ -33,7 +33,7 @@ pub(crate) struct CustomPtrDrop<'a, EltT> {
     drop: Box<dyn Fn(*mut EltT) + 'a + Send>,
 }
 
-impl<'a, EltT> CustomPtrDrop<'a, EltT> {
+impl<EltT> CustomPtrDrop<'_, EltT> {
     #[instrument(skip_all, parent = Span::current(), level= "Trace")]
     pub(crate) fn new(elt: *mut EltT, drop_fn: Box<dyn Fn(*mut EltT) + Send>) -> Self {
         Self {
@@ -47,13 +47,13 @@ impl<'a, EltT> CustomPtrDrop<'a, EltT> {
     }
 }
 
-impl<'a, EltT> Debug for CustomPtrDrop<'a, EltT> {
+impl<EltT> Debug for CustomPtrDrop<'_, EltT> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("CustomDrop").finish()
     }
 }
 
-impl<'a, EltT> Drop for CustomPtrDrop<'a, EltT> {
+impl<EltT> Drop for CustomPtrDrop<'_, EltT> {
     #[instrument(skip_all, parent = Span::current(), level= "Trace")]
     fn drop(&mut self) {
         let drop_fn = &self.drop;

src/hyperlight_host/src/mem/layout.rs

@@ -739,8 +739,7 @@ impl SandboxMemoryLayout {
 
         // Get the number of pages needed for the PTs
 
-        let num_pages: usize = ((total_mapped_memory_size + AMOUNT_OF_MEMORY_PER_PT - 1)
-            / AMOUNT_OF_MEMORY_PER_PT)
+        let num_pages: usize = total_mapped_memory_size.div_ceil(AMOUNT_OF_MEMORY_PER_PT)
             + 1 // Round up
             + 3; // PML4, PDPT, PD
 

src/hyperlight_host/src/mem/mgr.rs

@@ -181,8 +181,7 @@ where
 
             let mem_size = usize::try_from(mem_size)?;
 
-            let num_pages: usize =
-                ((mem_size + AMOUNT_OF_MEMORY_PER_PT - 1) / AMOUNT_OF_MEMORY_PER_PT) + 1;
+            let num_pages: usize = mem_size.div_ceil(AMOUNT_OF_MEMORY_PER_PT) + 1;
 
             // Create num_pages PT with 512 PTEs
             for p in 0..num_pages {

src/hyperlight_host/src/mem/pe/base_relocations.rs

@@ -71,7 +71,7 @@ impl<'a> BaseRelocations<'a> {
     }
 }
 
-impl<'a> Iterator for BaseRelocations<'a> {
+impl Iterator for BaseRelocations<'_> {
     type Item = BaseRelocation;
     fn next(&mut self) -> Option<Self::Item> {
         // Check if we can read 2 bytes from the array

src/hyperlight_host/src/sandbox/leaked_outb.rs

@@ -79,7 +79,7 @@ pub(crate) struct LeakedOutBWrapper<'a> {
     hdl_ptr: Arc<Mutex<CustomPtrDrop<'a, OutBHandlerWrapper>>>,
 }
 
-impl<'a> LeakedOutBWrapper<'a> {
+impl LeakedOutBWrapper<'_> {
     #[instrument(skip_all, parent = Span::current(), level = "Trace")]
     pub(crate) fn new(
         mgr: &mut SandboxMemoryManager<GuestSharedMemory>,

src/hyperlight_host/src/sandbox_state/transition.rs

@@ -100,7 +100,6 @@ impl<Cur: Sandbox, Next: Sandbox> TransitionMetadata<Cur, Next> for Noop<Cur, Ne
 /// };
 /// let mutating_cb = MultiUseContextCallback::from(my_cb_fn);
 /// ```
-
 pub struct MultiUseContextCallback<'func, Cur: Sandbox, F>
 where
     F: FnOnce(&mut MultiUseGuestCallContext) -> Result<()> + 'func,
@@ -110,14 +109,14 @@ where
     cb: F,
 }
 
-impl<'a, Cur: Sandbox, Next: Sandbox, F> TransitionMetadata<Cur, Next>
-    for MultiUseContextCallback<'a, Cur, F>
+impl<Cur: Sandbox, Next: Sandbox, F> TransitionMetadata<Cur, Next>
+    for MultiUseContextCallback<'_, Cur, F>
 where
     F: FnOnce(&mut MultiUseGuestCallContext) -> Result<()>,
 {
 }
 
-impl<'a, Cur: Sandbox, F> MultiUseContextCallback<'a, Cur, F>
+impl<Cur: Sandbox, F> MultiUseContextCallback<'_, Cur, F>
 where
     F: FnOnce(&mut MultiUseGuestCallContext) -> Result<()>,
 {