Skip to content

Commit 3884161

Browse files
committed
fix: functions with the "custom" ABI cannot have a return type
1 parent c363c1e commit 3884161

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/interrupts.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{gdt, print, println};
22
use lazy_static::lazy_static;
3-
use pc_keyboard::{layouts, DecodedKey, HandleControl, Keyboard, ScancodeSet1};
3+
use pc_keyboard::{DecodedKey, HandleControl, Keyboard, ScancodeSet1, layouts};
44
use pic8259::ChainedPics;
55
use spin::{self, Mutex};
66
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
@@ -54,10 +54,7 @@ extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
5454
println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
5555
}
5656

57-
extern "x86-interrupt" fn double_fault_handler(
58-
stack_frame: InterruptStackFrame,
59-
_error_code: u64,
60-
) -> ! {
57+
extern "x86-interrupt" fn double_fault_handler(stack_frame: InterruptStackFrame, _error_code: u64) {
6158
panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
6259
}
6360

0 commit comments

Comments
 (0)