fix(xtask): enable clippy for x86_64-uefi

src/arch/mod.rs

@@ -2,7 +2,7 @@
 pub use crate::arch::aarch64::*;
 #[cfg(target_arch = "riscv64")]
 pub use crate::arch::riscv64::*;
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(target_arch = "x86_64", target_os = "none"))]
 pub use crate::arch::x86_64::*;
 
 #[cfg(target_arch = "aarch64")]
@@ -11,5 +11,5 @@ pub mod aarch64;
 #[cfg(target_arch = "riscv64")]
 pub mod riscv64;
 
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(target_arch = "x86_64", target_os = "none"))]
 pub mod x86_64;

src/macros.rs

@@ -3,6 +3,7 @@
 /// Adapted from [`std::print`].
 ///
 /// [`std::print`]: https://doc.rust-lang.org/stable/std/macro.print.html
+#[cfg(target_os = "none")]
 #[macro_export]
 macro_rules! print {
     ($($arg:tt)*) => {{
@@ -15,6 +16,7 @@ macro_rules! print {
 /// Adapted from [`std::println`].
 ///
 /// [`std::println`]: https://doc.rust-lang.org/stable/std/macro.println.html
+#[cfg(target_os = "none")]
 #[macro_export]
 macro_rules! println {
     () => {

src/main.rs

@@ -11,17 +11,20 @@ mod macros;
 #[cfg(target_os = "none")]
 mod allocator;
 mod arch;
+#[cfg(target_os = "none")]
 mod console;
+#[cfg(target_os = "none")]
 mod log;
 #[cfg(target_os = "none")]
 mod none;
 #[cfg(target_os = "uefi")]
 mod uefi;
 
-use core::fmt::{self, Write};
-
+#[cfg(target_os = "none")]
 #[doc(hidden)]
-fn _print(args: fmt::Arguments<'_>) {
+fn _print(args: core::fmt::Arguments<'_>) {
+	use core::fmt::Write;
+
 	unsafe {
 		console::CONSOLE.write_fmt(args).unwrap();
 	}

xtask/src/main.rs

@@ -142,11 +142,10 @@ impl flags::Clippy {
 	fn run(self) -> Result<()> {
 		let sh = Shell::new()?;
 
-		// TODO: Enable clippy for x86_64-uefi
-		// https://github.com/hermitcore/loader/issues/122
 		for target in [
 			Target::X86_64,
 			Target::X86_64Fc,
+			Target::X86_64Uefi,
 			Target::AArch64,
 			Target::Riscv64,
 		] {