diff --git a/src/arch/x86_shared/interrupt/exception.rs b/src/arch/x86_shared/interrupt/exception.rs index e14859e2f8..7aea910638 100644 --- a/src/arch/x86_shared/interrupt/exception.rs +++ b/src/arch/x86_shared/interrupt/exception.rs @@ -2,9 +2,8 @@ use syscall::Exception; use x86::irq::PageFaultError; use crate::{ - arch::x86_shared::interrupt, context::signal::excp_handler, interrupt_error, interrupt_stack, - memory::GenericPfFlags, paging::VirtualAddress, panic::stack_trace, ptrace, - sync::CleanLockToken, syscall::flag::*, + arch::x86_shared::interrupt, context::signal::excp_handler, memory::GenericPfFlags, + paging::VirtualAddress, panic::stack_trace, ptrace, sync::CleanLockToken, syscall::flag::*, }; interrupt_stack!(divide_by_zero, |stack| { diff --git a/src/arch/x86_shared/interrupt/irq.rs b/src/arch/x86_shared/interrupt/irq.rs index 1284f0d085..9235b3ed2e 100644 --- a/src/arch/x86_shared/interrupt/irq.rs +++ b/src/arch/x86_shared/interrupt/irq.rs @@ -8,7 +8,6 @@ use crate::{ ioapic, local_apic, pic, pit, serial::{COM1, COM2}, }, - interrupt, interrupt_stack, ipi::{ipi, IpiKind, IpiTarget}, percpu::PercpuBlock, scheme::{irq::irq_trigger, serio::serio_input}, diff --git a/src/scheme/mod.rs b/src/scheme/mod.rs index 76d7edc649..ffd5d0d061 100644 --- a/src/scheme/mod.rs +++ b/src/scheme/mod.rs @@ -254,7 +254,7 @@ impl SchemeList { Ok(to) } - pub fn iter_name(&self, ns: SchemeNamespace) -> SchemeIter { + pub fn iter_name(&self, ns: SchemeNamespace) -> SchemeIter<'_> { SchemeIter { inner: self.names.get(&ns).map(|names| names.iter()), } diff --git a/src/startup/memory.rs b/src/startup/memory.rs index 28d3d0186c..976c76182d 100644 --- a/src/startup/memory.rs +++ b/src/startup/memory.rs @@ -101,7 +101,7 @@ impl MemoryMap { } } - fn iter(&self) -> Iter { + fn iter(&self) -> Iter<'_, MemoryEntry> { self.entries[0..self.size].iter() }