Changes for new lints/issues in Rust v1.89

Signed-off-by: Simon Davies <[email protected]>

Author: simongdavies

src/hyperlight_common/src/clippy.toml

@@ -2,6 +2,4 @@ disallowed-macros = [
     { path = "std::assert", reason = "no asserts in release builds" },
     { path = "std::assert_eq", reason = "no asserts in release builds" },
     { path = "std::assert_ne", reason = "no asserts in release builds" },
-    { path = "std::assert_true", reason = "no asserts in release builds" },
-    { path = "std::assert_false", reason = "no asserts in release builds" },
 ]

src/hyperlight_common/src/flatbuffers/mod.rs

@@ -2,6 +2,7 @@
 // @generated
 pub mod hyperlight {
     use super::*;
+    #[allow(mismatched_lifetime_syntaxes)]
     pub mod generated {
         use super::*;
         mod parameter_value_generated;

src/hyperlight_component_util/src/emit.rs

@@ -680,7 +680,7 @@ impl<'a> WitName<'a> {
     }
 }
 /// Parse a kebab-name as a WIT name
-pub fn split_wit_name(n: &str) -> WitName {
+pub fn split_wit_name(n: &str) -> WitName<'_> {
     let mut namespaces = Vec::new();
     let mut colon_components = n.split(':').rev();
     let last = colon_components.next().unwrap();

src/hyperlight_guest_tracing_macro/src/lib.rs

@@ -113,10 +113,10 @@ impl syn::parse::Parse for TraceMacroInput {
         if !matches!(message, syn::Lit::Str(_)) {
             return Err(input.error("first argument to trace! must be a string literal"));
         }
-        if let syn::Lit::Str(ref lit_str) = message {
-            if lit_str.value().is_empty() {
-                return Err(input.error("trace message must not be empty"));
-            }
+        if let syn::Lit::Str(ref lit_str) = message
+            && lit_str.value().is_empty()
+        {
+            return Err(input.error("trace message must not be empty"));
         }
 
         let statement = if input.peek(syn::Token![,]) {

src/hyperlight_host/clippy.toml

@@ -2,6 +2,4 @@ disallowed-macros = [
     { path = "std::assert", reason = "no asserts in release builds" },
     { path = "std::assert_eq", reason = "no asserts in release builds" },
     { path = "std::assert_ne", reason = "no asserts in release builds" },
-    { path = "std::assert_true", reason = "no asserts in release builds" },
-    { path = "std::assert_false", reason = "no asserts in release builds" },
 ]

src/hyperlight_host/src/hypervisor/gdb/x86_64_target.rs

@@ -133,18 +133,18 @@ impl Target for HyperlightSandboxTarget {
     type Arch = GdbTargetArch;
     type Error = GdbTargetError;
 
-    fn support_breakpoints(&mut self) -> Option<BreakpointsOps<Self>> {
+    fn support_breakpoints(&mut self) -> Option<BreakpointsOps<'_, Self>> {
         Some(self)
     }
 
     #[inline(always)]
-    fn base_ops(&mut self) -> BaseOps<Self::Arch, Self::Error> {
+    fn base_ops(&mut self) -> BaseOps<'_, Self::Arch, Self::Error> {
         BaseOps::SingleThread(self)
     }
 
     fn support_section_offsets(
         &mut self,
-    ) -> Option<gdbstub::target::ext::section_offsets::SectionOffsetsOps<Self>> {
+    ) -> Option<gdbstub::target::ext::section_offsets::SectionOffsetsOps<'_, Self>> {
         Some(self)
     }
 }
@@ -288,7 +288,7 @@ impl SingleThreadBase for HyperlightSandboxTarget {
         }
     }
 
-    fn support_resume(&mut self) -> Option<SingleThreadResumeOps<Self>> {
+    fn support_resume(&mut self) -> Option<SingleThreadResumeOps<'_, Self>> {
         Some(self)
     }
 }
@@ -315,7 +315,7 @@ impl SectionOffsets for HyperlightSandboxTarget {
 }
 
 impl Breakpoints for HyperlightSandboxTarget {
-    fn support_hw_breakpoint(&mut self) -> Option<HwBreakpointOps<Self>> {
+    fn support_hw_breakpoint(&mut self) -> Option<HwBreakpointOps<'_, Self>> {
         Some(self)
     }
     fn support_sw_breakpoint(&mut self) -> Option<SwBreakpointOps<'_, Self>> {
@@ -438,7 +438,7 @@ impl SingleThreadResume for HyperlightSandboxTarget {
         log::debug!("Resume");
         self.resume_vcpu()
     }
-    fn support_single_step(&mut self) -> Option<SingleThreadSingleStepOps<Self>> {
+    fn support_single_step(&mut self) -> Option<SingleThreadSingleStepOps<'_, Self>> {
         Some(self)
     }
 }

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -961,7 +961,7 @@ impl Hypervisor for HypervLinuxDriver {
     }
 
     #[cfg(crashdump)]
-    fn crashdump_context(&self) -> Result<Option<super::crashdump::CrashDumpContext>> {
+    fn crashdump_context(&self) -> Result<Option<super::crashdump::CrashDumpContext<'_>>> {
         if self.rt_cfg.guest_core_dump {
             let mut regs = [0; 27];
 

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -832,7 +832,7 @@ impl Hypervisor for KVMDriver {
     }
 
     #[cfg(crashdump)]
-    fn crashdump_context(&self) -> Result<Option<crashdump::CrashDumpContext>> {
+    fn crashdump_context(&self) -> Result<Option<crashdump::CrashDumpContext<'_>>> {
         if self.rt_cfg.guest_core_dump {
             let mut regs = [0; 27];
 

src/hyperlight_host/src/hypervisor/mod.rs

@@ -230,7 +230,7 @@ pub(crate) trait Hypervisor: Debug + Send {
     fn as_mut_hypervisor(&mut self) -> &mut dyn Hypervisor;
 
     #[cfg(crashdump)]
-    fn crashdump_context(&self) -> Result<Option<crashdump::CrashDumpContext>>;
+    fn crashdump_context(&self) -> Result<Option<crashdump::CrashDumpContext<'_>>>;
 
     #[cfg(gdb)]
     /// handles the cases when the vCPU stops due to a Debug event
@@ -267,16 +267,15 @@ pub(crate) fn get_memory_access_violation<'a>(
     // find the region containing the given gpa
     let region = mem_regions.find(|region| region.guest_region.contains(&gpa));
 
-    if let Some(region) = region {
-        if !region.flags.contains(access_info)
-            || region.flags.contains(MemoryRegionFlags::STACK_GUARD)
-        {
-            return Some(HyperlightExit::AccessViolation(
-                gpa as u64,
-                access_info,
-                region.flags,
-            ));
-        }
+    if let Some(region) = region
+        && (!region.flags.contains(access_info)
+            || region.flags.contains(MemoryRegionFlags::STACK_GUARD))
+    {
+        return Some(HyperlightExit::AccessViolation(
+            gpa as u64,
+            access_info,
+            region.flags,
+        ));
     }
     None
 }

src/hyperlight_host/src/mem/mgr.rs

@@ -223,10 +223,11 @@ where
         let addr = (p << 21) + (i << 12);
 
         // First check if we're still in the cached region
-        if let Some(cached_idx) = *cached_region_idx {
-            if cached_idx < regions.len() && regions[cached_idx].guest_region.contains(&addr) {
-                return Ok(regions[cached_idx].region_type);
-            }
+        if let Some(cached_idx) = *cached_region_idx
+            && cached_idx < regions.len()
+            && regions[cached_idx].guest_region.contains(&addr)
+        {
+            return Ok(regions[cached_idx].region_type);
         }
 
         // If not in cached region, try adjacent regions first (common for sequential access)