Fix lints for Rust 1.84

Author: smalis-msft

Cargo.toml

@@ -591,13 +591,18 @@ rust-2024-compatibility = { level = "warn", priority = -1 }
 edition_2024_expr_fragment_specifier = "allow"
 impl_trait_overcaptures = "allow"
 deprecated-safe-2024 = "allow"
+tail-expr-drop-order = "allow"
+if-let-rescope = "allow"
 
 unused_qualifications = "warn"
 
 # Code that needs unsafe should opt-in via a module-scoped allow.
 unsafe_code = "deny"
 unsafe_op_in_unsafe_fn = "forbid"
 
+# TODO: Needed for xshell compatibility, fixed in v0.2.7
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(trick_rust_analyzer_into_highlighting_interpolated_bits)'] }
+
 [workspace.lints.clippy]
 dbg_macro = "warn"
 debug_assert_with_mut_call = "warn"

openhcl/openhcl_boot/src/main.rs

@@ -825,7 +825,7 @@ fn validate_vp_hw_ids(partition_info: &PartitionInfo) {
     if let Some((i, &vp_index)) = vp_indexes
         .iter()
         .enumerate()
-        .find(|(i, &vp_index)| *i as u32 != vp_index)
+        .find(|&(i, vp_index)| i as u32 != *vp_index)
     {
         panic!(
             "CPU hardware ID {:#x} does not correspond to VP index {}",

openhcl/sidecar_client/src/lib.rs

@@ -572,7 +572,7 @@ impl<'a> SidecarVp<'a> {
             match &mut *vp {
                 VpState::Stopped => unreachable!(),
                 VpState::Running(waker) => {
-                    if !waker.as_ref().map_or(false, |w| cx.waker().will_wake(w)) {
+                    if !waker.as_ref().is_some_and(|w| cx.waker().will_wake(w)) {
                         *waker = Some(cx.waker().clone());
                     }
                     Poll::Pending

openhcl/underhill_confidentiality/src/getters.rs

@@ -7,7 +7,7 @@ static CONFIDENTIAL: OnceLock<bool> = OnceLock::new();
 static CONFIDENTIAL_DEBUG: OnceLock<bool> = OnceLock::new();
 
 fn get_bool_env_var(name: &str) -> bool {
-    std::env::var_os(name).map_or(false, |v| !v.is_empty() && v != "0")
+    std::env::var_os(name).is_some_and(|v| !v.is_empty() && v != "0")
 }
 
 /// Gets whether the current VM is a confidential VM.

openhcl/underhill_core/src/get_tracing.rs

@@ -185,7 +185,7 @@ impl GetTracingBackend {
 
 /// Enables tracing output to the tracing task and to stderr.
 pub fn init_tracing(spawn: impl Spawn, tracer: RemoteTracer) -> anyhow::Result<()> {
-    if legacy_openvmm_env("OPENVMM_DISABLE_TRACING_RATELIMITS").map_or(false, |v| !v.is_empty()) {
+    if legacy_openvmm_env("OPENVMM_DISABLE_TRACING_RATELIMITS").is_some_and(|v| !v.is_empty()) {
         tracelimit::disable_rate_limiting(true);
     }
 

openhcl/underhill_crash/src/options.rs

@@ -62,7 +62,7 @@ impl Options {
         );
 
         let verbose_var = std::env::var("UNDERHILL_CRASH_VERBOSE").unwrap_or_default();
-        let verbose = verbose_var == "1" || verbose_var.to_ascii_lowercase() == "true";
+        let verbose = verbose_var == "1" || verbose_var.eq_ignore_ascii_case("true");
 
         Self {
             pid,

openhcl/underhill_dump/src/lib.rs

@@ -37,7 +37,7 @@ pub fn main() -> ! {
 pub fn do_main() -> anyhow::Result<()> {
     let mut args = std::env::args().skip(1).peekable();
 
-    let level = if args.peek().map_or(false, |x| x == "-v") {
+    let level = if args.peek().is_some_and(|x| x == "-v") {
         args.next();
         Level::DEBUG
     } else {

openhcl/virt_mshv_vtl/src/processor/mod.rs

@@ -669,7 +669,7 @@ impl<'p, T: Backing> Processor for UhProcessor<'p, T> {
                 // Ensure the waker is set.
                 if !last_waker
                     .as_ref()
-                    .map_or(false, |waker| cx.waker().will_wake(waker))
+                    .is_some_and(|waker| cx.waker().will_wake(waker))
                 {
                     last_waker = Some(cx.waker().clone());
                     self.inner.waker.write().clone_from(&last_waker);

openvmm/openvmm_entry/src/lib.rs

@@ -1329,9 +1329,9 @@ fn cleanup_socket(path: &Path) {
     #[cfg(windows)]
     let is_socket = pal::windows::fs::is_unix_socket(path).unwrap_or(false);
     #[cfg(not(windows))]
-    let is_socket = path.metadata().map_or(false, |meta| {
-        std::os::unix::fs::FileTypeExt::is_socket(&meta.file_type())
-    });
+    let is_socket = path
+        .metadata()
+        .is_ok_and(|meta| std::os::unix::fs::FileTypeExt::is_socket(&meta.file_type()));
 
     if is_socket {
         let _ = std::fs::remove_file(path);

openvmm/openvmm_entry/src/tracing_init.rs

@@ -37,7 +37,7 @@ pub fn enable_tracing() -> anyhow::Result<()> {
             .add_directive(base.parse().unwrap())
     };
 
-    if legacy_openvmm_env("OPENVMM_DISABLE_TRACING_RATELIMITS").map_or(false, |v| !v.is_empty()) {
+    if legacy_openvmm_env("OPENVMM_DISABLE_TRACING_RATELIMITS").is_ok_and(|v| !v.is_empty()) {
         tracelimit::disable_rate_limiting(true);
     }