Commit d5e07ab

authored

Merge pull request #1703 from rust-osdev/bishop-unpin-night

Fix lints/tests on nightly and unpin the CI nightly version

2 parents 5d233a5 + e24491f commit d5e07abCopy full SHA for d5e07ab

File tree

+13

-3

lines changed

+13

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`[toolchain]`
`2`		`-channel = "nightly-2025年06月01日"`
	`2`	`+channel = "nightly"`
`3`	`3`	`targets = ["aarch64-unknown-uefi", "i686-unknown-uefi", "x86_64-unknown-uefi"]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ use uefi::proto::driver::ComponentName1;`
`12`	`12`	/// `ComponentName`.
`13`	`13`	`trait ComponentNameInterface: Sized {`
`14`	`14`	`fn open(handle: Handle) -> Result<Self>;`
`15`		`- fn supported_languages(&self) -> core::result::Result<LanguageIter, LanguageError>;`
	`15`	`+ fn supported_languages(&self) -> core::result::Result<LanguageIter<'_>, LanguageError>;`
`16`	`16`	`fn driver_name(&self, language: &str) -> Result<&CStr16>;`
`17`	`17`	`fn controller_name(`
`18`	`18`	`&self,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ mod tests_mmap_artificial {`
`107`	`107`	`use super::*;`
`108`	`108`	`use core::mem::{size_of, size_of_val};`
`109`	`109`
`110`		`- fn buffer_to_map(buffer: &mut [MemoryDescriptor]) -> MemoryMapRefMut {`
	`110`	`+ fn buffer_to_map(buffer: &mut [MemoryDescriptor]) -> MemoryMapRefMut<'_> {`
`111`	`111`	`let mmap_len = size_of_val(buffer);`
`112`	`112`	`let mmap = {`
`113`	`113`	`unsafe { core::slice::from_raw_parts_mut(buffer.as_mut_ptr().cast::<u8>(), mmap_len) }`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,16 @@ impl Cargo {`
`322`	`322`	`rustflags.push_str(" --verbose");`
`323`	`323`	`cmd.env("RUSTFLAGS", rustflags);`
`324`	`324`	`}`
	`325`	`+`
	`326`	`+ // Skip the uefi-macros compilation "ui" tests on the nightly`
	`327`	`+ // toolchain. These tests are sensitive to compiler version, and`
	`328`	`+ // sometimes the output on nightly doesn't match the stable`
	`329`	`+ // toolchain.`
	`330`	`+ let toolchain = env::var("RUSTUP_TOOLCHAIN").unwrap_or_default();`
	`331`	`+ if toolchain.starts_with("nightly-") {`
	`332`	`+ println!("skipping uefi-macros ui tests for toolchain {toolchain}");`
	`333`	`+ tool_args.extend(["--skip", "ui"]);`
	`334`	`+ }`
`325`	`335`	`}`
`326`	`336`	`};`
`327`	`337`	`cmd.arg(action);`

Comments

(0)