From 4b94bd67e6c00e24682a65d0b0750bdc81dec3f0 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Thu, 19 Jun 2025 15:01:48 -0400 Subject: [PATCH 1/3] uefi/test-runner: Fix mismatched-lifetime-syntaxes lints --- uefi-test-runner/src/proto/driver.rs | 2 +- uefi/src/mem/memory_map/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uefi-test-runner/src/proto/driver.rs b/uefi-test-runner/src/proto/driver.rs index f6bacff21..7a6b1e75d 100644 --- a/uefi-test-runner/src/proto/driver.rs +++ b/uefi-test-runner/src/proto/driver.rs @@ -12,7 +12,7 @@ use uefi::proto::driver::ComponentName1; /// `ComponentName`. trait ComponentNameInterface: Sized { fn open(handle: Handle) -> Result; - fn supported_languages(&self) -> core::result::Result; + fn supported_languages(&self) -> core::result::Result, LanguageError>; fn driver_name(&self, language: &str) -> Result<&CStr16>; fn controller_name( &self, diff --git a/uefi/src/mem/memory_map/mod.rs b/uefi/src/mem/memory_map/mod.rs index 8fab63344..4c0c08797 100644 --- a/uefi/src/mem/memory_map/mod.rs +++ b/uefi/src/mem/memory_map/mod.rs @@ -107,7 +107,7 @@ mod tests_mmap_artificial { use super::*; use core::mem::{size_of, size_of_val}; - fn buffer_to_map(buffer: &mut [MemoryDescriptor]) -> MemoryMapRefMut { + fn buffer_to_map(buffer: &mut [MemoryDescriptor]) -> MemoryMapRefMut<'_> { let mmap_len = size_of_val(buffer); let mmap = { unsafe { core::slice::from_raw_parts_mut(buffer.as_mut_ptr().cast::(), mmap_len) } From 427689557fc6efbc212175c335268491bac85c5d Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Thu, 19 Jun 2025 15:40:12 -0400 Subject: [PATCH 2/3] xtask: Skip uefi-macros ui tests on the nightly toolchain These tests are sensitive to compiler version, and sometimes the output on nightly doesn't match the stable toolchain. --- xtask/src/cargo.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xtask/src/cargo.rs b/xtask/src/cargo.rs index af6e3fe80..461a399fb 100644 --- a/xtask/src/cargo.rs +++ b/xtask/src/cargo.rs @@ -322,6 +322,16 @@ impl Cargo { rustflags.push_str(" --verbose"); cmd.env("RUSTFLAGS", rustflags); } + + // Skip the uefi-macros compilation "ui" tests on the nightly + // toolchain. These tests are sensitive to compiler version, and + // sometimes the output on nightly doesn't match the stable + // toolchain. + let toolchain = env::var("RUSTUP_TOOLCHAIN").unwrap_or_default(); + if toolchain.starts_with("nightly-") { + println!("skipping uefi-macros ui tests for toolchain {toolchain}"); + tool_args.extend(["--skip", "ui"]); + } } }; cmd.arg(action); From e24491f9afb11988d21ba2c9035f1440f8c8b735 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Thu, 19 Jun 2025 14:34:37 -0400 Subject: [PATCH 3/3] Revert "ci: Temporarily pin to older nightly" This (partially) reverts commit bdd3650fabced8c88cf9e483b08d15f01ad036c5. --- .github/workflows/nightly_toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_toolchain.toml b/.github/workflows/nightly_toolchain.toml index a962cf540..a96790bb0 100644 --- a/.github/workflows/nightly_toolchain.toml +++ b/.github/workflows/nightly_toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-06-01" +channel = "nightly" targets = ["aarch64-unknown-uefi", "i686-unknown-uefi", "x86_64-unknown-uefi"]