Fix some clippy errors
This commit is contained in:
@@ -8,7 +8,7 @@ use x86_64::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use crate::arch::x86_64::cpu::msr::*;
|
use crate::arch::x86_64::cpu::msr::*;
|
||||||
use crate::arch::x86_64::memory::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
|
use crate::arch::x86_64::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
|
||||||
|
|
||||||
const IA32_APIC_BASE_MSR: u32 = 0x1b;
|
const IA32_APIC_BASE_MSR: u32 = 0x1b;
|
||||||
const IA32_APIC_BASE_MSR_BSP: u64 = 0x100;
|
const IA32_APIC_BASE_MSR_BSP: u64 = 0x100;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use x86_64::structures::paging::mapper::MapperFlushAll;
|
|||||||
use x86_64::structures::paging::{FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB};
|
use x86_64::structures::paging::{FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB};
|
||||||
|
|
||||||
use super::gdt;
|
use super::gdt;
|
||||||
use crate::arch::x86_64::memory::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
|
use crate::arch::x86_64::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
|
||||||
use crate::{println_log, serial_println};
|
use crate::{println_log, serial_println};
|
||||||
use spin::{Lazy, Mutex};
|
use spin::{Lazy, Mutex};
|
||||||
|
|
||||||
|
|||||||
+7
-5
@@ -12,8 +12,10 @@
|
|||||||
)]
|
)]
|
||||||
|
|
||||||
extern crate alloc;
|
extern crate alloc;
|
||||||
use crate::prelude::*;
|
use crate::{
|
||||||
use crate::arch::x86_64::memory::memory::{init_frame_allocator, init_page_table};
|
arch::x86_64::memory::{init_frame_allocator, init_page_table},
|
||||||
|
prelude::*,
|
||||||
|
};
|
||||||
use arch::x86_64::memory::allocation::allocator::init_heap;
|
use arch::x86_64::memory::allocation::allocator::init_heap;
|
||||||
use arch::x86_64::memory::memory_map;
|
use arch::x86_64::memory::memory_map;
|
||||||
use core::arch::asm;
|
use core::arch::asm;
|
||||||
@@ -27,10 +29,10 @@ pub mod std;
|
|||||||
pub mod util;
|
pub mod util;
|
||||||
|
|
||||||
pub mod prelude {
|
pub mod prelude {
|
||||||
pub use crate::std::io::{
|
pub use crate::std::io::{_print, _print_log, _serial_write};
|
||||||
_print, _print_log, _serial_write
|
pub use crate::{
|
||||||
|
print, print_log, printerr, println, println_log, printlnerr, serial_print, serial_println,
|
||||||
};
|
};
|
||||||
pub use crate::{print, println, print_log, println_log, printerr, printlnerr, serial_print, serial_println};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the base revision to the latest revision supported by the crate.
|
/// Sets the base revision to the latest revision supported by the crate.
|
||||||
|
|||||||
+1
-3
@@ -31,7 +31,5 @@ extern "C" fn kmain() -> ! {
|
|||||||
|
|
||||||
let mut executor = Executor::new();
|
let mut executor = Executor::new();
|
||||||
executor.spawn(Task::new(shell()));
|
executor.spawn(Task::new(shell()));
|
||||||
executor.run();
|
executor.run()
|
||||||
|
|
||||||
loop {}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user