fix(virtq): make clippy happy

Signed-off-by: Tomasz Andrzejak <andreiltd@gmail.com>

Author: andreiltd

src/hyperlight_common/src/virtq/buffer.rs

@@ -139,15 +139,22 @@ impl<F: FnOnce(Allocation)> AllocGuard<F> {
     }
 
     pub fn release(mut self) -> Allocation {
-        self.0.take().unwrap().0
+        // Safety: AllocGuard is always constructed with Some, and release is only called once
+        self.0.take().map(|(alloc, _)| alloc).unwrap_or_else(|| {
+            unreachable!("AllocGuard::release called on dismissed guard")
+        })
     }
 }
 
 impl<F: FnOnce(Allocation)> core::ops::Deref for AllocGuard<F> {
     type Target = Allocation;
 
     fn deref(&self) -> &Allocation {
-        &self.0.as_ref().unwrap().0
+        // Safety: AllocGuard is always constructed with Some, and the inner value is only
+        // taken by release() or Drop.
+        &self.0.as_ref().unwrap_or_else(|| {
+            unreachable!("AllocGuard::deref called on dismissed guard")
+        }).0
     }
 }
 

src/hyperlight_common/src/virtq/mod.rs

@@ -351,6 +351,7 @@ impl From<BufferElement> for Allocation {
 }
 
 const _: () = {
+    #[allow(clippy::unwrap_used)]
     const fn verify_layout(num_descs: usize) {
         let base = 0x1000u64;
 

src/hyperlight_common/src/virtq/producer.rs

@@ -519,8 +519,8 @@ where
         self.inner.reset_prefilled(&ids);
 
         let addrs: SmallVec<[u64; 64]> = (0..prefill_count)
-            .map(|i| self.pool.slot_addr(i).expect("prefill_count <= pool count"))
-            .collect();
+            .map(|i| self.pool.slot_addr(i).ok_or(VirtqError::InvalidState))
+            .collect::<Result<_, _>>()?;
 
         self.pool
             .restore_allocated(&addrs)

src/hyperlight_common/src/virtq/ring.rs

@@ -1276,7 +1276,6 @@ pub fn ring_need_event(event_idx: u16, new: u16, old: u16) -> bool {
     new.wrapping_sub(event_idx).wrapping_sub(1) < new.wrapping_sub(old)
 }
 
-
 impl From<&Descriptor> for BufferElement {
     fn from(desc: &Descriptor) -> Self {
         BufferElement {

src/hyperlight_host/src/sandbox/initialized_multi_use.rs

@@ -1718,8 +1718,8 @@ mod tests {
 
         for (name, heap_size) in test_cases {
             let mut cfg = SandboxConfiguration::default();
-            cfg.set_heap_size(128 * 1024);
-            cfg.set_scratch_size(0x100000);
+            cfg.set_heap_size(heap_size);
+            cfg.set_scratch_size(heap_size as usize + 0x100000);
 
             let path = simple_guest_as_string().unwrap();
             let sbox = UninitializedSandbox::new(GuestBinary::FilePath(path), Some(cfg))