Rename interrupt and exception handlers

6 files changed, 13 insertions, 13 deletions

diff --git a/kernel/src/interrupts/exceptions.rs b/kernel/src/interrupts/exception_handlers.rs
index a3ecf9d..a3ecf9d 100644
--- a/kernel/src/interrupts/exceptions.rs
+++ b/kernel/src/interrupts/exception_handlers.rs
diff --git a/kernel/src/interrupts/idt.rs b/kernel/src/interrupts/idt.rs
index 87f16c0..4978755 100644
--- a/kernel/src/interrupts/idt.rs
+++ b/kernel/src/interrupts/idt.rs
@@ -1,4 +1,4 @@
-use super::{exceptions, gdt, interrupts, Interrupts};
+use super::{exception_handlers, gdt, interrupt_handlers, Interrupts};
 use lazy_static::lazy_static;
 use x86_64::structures::idt::InterruptDescriptorTable;
 
@@ -6,20 +6,20 @@ lazy_static! {
     static ref IDT: InterruptDescriptorTable = {
         let mut idt = InterruptDescriptorTable::new();
         idt.breakpoint
-            .set_handler_fn(exceptions::breakpoint_handler);
+            .set_handler_fn(exception_handlers::breakpoint_handler);
         idt.segment_not_present
-            .set_handler_fn(exceptions::segment_not_present_handler);
+            .set_handler_fn(exception_handlers::segment_not_present_handler);
         idt.general_protection_fault
-            .set_handler_fn(exceptions::general_protection_fault_handler);
+            .set_handler_fn(exception_handlers::general_protection_fault_handler);
         unsafe {
             idt.double_fault
-                .set_handler_fn(exceptions::double_fault_handler)
+                .set_handler_fn(exception_handlers::double_fault_handler)
                 .set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX);
             idt.page_fault
-                .set_handler_fn(exceptions::page_fault_handler)
+                .set_handler_fn(exception_handlers::page_fault_handler)
                 .set_stack_index(gdt::PAGE_FAULT_IST_INDEX);
         }
-        idt[Interrupts::Timer.as_usize()].set_handler_fn(interrupts::timer_handler);
+        idt[Interrupts::Timer.as_usize()].set_handler_fn(interrupt_handlers::timer_handler);
 
         idt
     };
diff --git a/kernel/src/interrupts/interrupts.rs b/kernel/src/interrupts/interrupt_handlers.rs
index 6296375..6296375 100644
--- a/kernel/src/interrupts/interrupts.rs
+++ b/kernel/src/interrupts/interrupt_handlers.rs
diff --git a/kernel/src/interrupts/mod.rs b/kernel/src/interrupts/mod.rs
index bc313b8..1cab595 100644
--- a/kernel/src/interrupts/mod.rs
+++ b/kernel/src/interrupts/mod.rs
@@ -1,8 +1,8 @@
 pub mod apic;
-pub mod exceptions;
+pub mod exception_handlers;
 pub mod gdt;
 pub mod idt;
-pub mod interrupts;
+pub mod interrupt_handlers;
 
 const INT_OFFSET: u8 = 32;
 
diff --git a/kernel/tests/int3.rs b/kernel/tests/int3.rs
index f5b5470..e71ff68 100644
--- a/kernel/tests/int3.rs
+++ b/kernel/tests/int3.rs
@@ -6,14 +6,14 @@
 
 use kernel;
 use kernel::interrupts;
-use kernel::interrupts::exceptions;
+use kernel::interrupts::exception_handlers;
 use kernel::io::qemu;
 
 #[no_mangle]
 extern "C" fn _start() -> ! {
     kernel::init();
     unsafe {
-        exceptions::expect_fault(interrupts::Interrupts::Breakpoint);
+        exception_handlers::expect_fault(interrupts::Interrupts::Breakpoint);
     }
     x86_64::instructions::interrupts::int3();
     panic!("BREAKPOINT not caught");
diff --git a/kernel/tests/stack_overflow.rs b/kernel/tests/stack_overflow.rs
index 9e75f59..5ddc1ae 100644
--- a/kernel/tests/stack_overflow.rs
+++ b/kernel/tests/stack_overflow.rs
@@ -7,14 +7,14 @@
 use core::fmt::Write;
 use kernel;
 use kernel::interrupts;
-use kernel::interrupts::exceptions;
+use kernel::interrupts::exception_handlers;
 use kernel::io::qemu;
 
 #[no_mangle]
 extern "C" fn _start() -> ! {
     kernel::init();
     unsafe {
-        exceptions::expect_fault(interrupts::Interrupts::PageFault);
+        exception_handlers::expect_fault(interrupts::Interrupts::PageFault);
     }
     _loop(0);
     panic!("PAGE_FAULT not caught");