diff --git a/build.rs b/build.rs index 8df240786d..8720635b4b 100644 --- a/build.rs +++ b/build.rs @@ -23,7 +23,10 @@ fn parse_kconfig(arch: &str) -> Option<()> { .as_table() .unwrap(); - let features_list = altfeatures.keys().map(|feat| format!(", {feat:?}")).collect::(); + let features_list = altfeatures + .keys() + .map(|feat| format!(", {feat:?}")) + .collect::(); println!("cargo::rustc-check-cfg=cfg(cpu_feature_always, values(\"\"{features_list}))"); println!("cargo::rustc-check-cfg=cfg(cpu_feature_auto, values(\"\"{features_list}))"); println!("cargo::rustc-check-cfg=cfg(cpu_feature_never, values(\"\"{features_list}))"); diff --git a/src/arch/aarch64/device/generic_timer.rs b/src/arch/aarch64/device/generic_timer.rs index 0d736cfafe..822677df73 100644 --- a/src/arch/aarch64/device/generic_timer.rs +++ b/src/arch/aarch64/device/generic_timer.rs @@ -60,7 +60,10 @@ impl GenericTimer { } pub fn init(&mut self) { self.use_virtual_timer = unsafe { !control_regs::vhe_present() }; - debug!("generic_timer use_virtual_timer = {:?}", self.use_virtual_timer); + debug!( + "generic_timer use_virtual_timer = {:?}", + self.use_virtual_timer + ); let clk_freq = unsafe { control_regs::cntfrq_el0() }; self.clk_freq = clk_freq; self.reload_count = clk_freq / 100; diff --git a/src/arch/x86_64/interrupt/irq.rs b/src/arch/x86_64/interrupt/irq.rs index e33083dec4..29c7531ebe 100644 --- a/src/arch/x86_64/interrupt/irq.rs +++ b/src/arch/x86_64/interrupt/irq.rs @@ -4,7 +4,6 @@ use alloc::vec::Vec; #[cfg(feature = "sys_stat")] use crate::percpu::PercpuBlock; -use crate::scheme::irq::irq_trigger; use crate::{ context::{self, timeout}, device::{ @@ -15,6 +14,7 @@ use crate::{ ipi::{ipi, IpiKind, IpiTarget}, scheme::{ debug::{debug_input, debug_notify}, + irq::irq_trigger, serio::serio_input, }, time,