Update dependencies (#42)

* Reorder dependencies

* Update x86 dependencies

Cargo.toml

@@ -16,20 +16,20 @@ qwerty = []
 dvorak = []
 
 [dependencies]
-bootloader = { version = "0.8.3", features = ["map_physical_memory"]}
-linked_list_allocator = "0.6.4"
-volatile = "0.2.6"
-spin = "0.5.2"
-x86_64 = "0.8.1"
-pic8259_simple = "0.1.1"
-pc-keyboard = { git = "https://github.com/thejpster/pc-keyboard" }
+base64 = { version = "0.11", default-features = false }
 bit_field = "0.10.0"
-raw-cpuid = "7.0.3"
-uart_16550 = "0.2.1"
+bootloader = { version = "0.9.0", features = ["map_physical_memory"]}
+hmac = { version = "0.7", default-features = false }
 lazy_static = { version = "1.0", features = ["spin_no_std"] }
-base64 = { version = "0.11", default-features = false }
+libm = "0.2.1"
+linked_list_allocator = "0.8.2"
 pbkdf2 = { version = "0.3", default-features = false }
+pc-keyboard = { git = "https://github.com/thejpster/pc-keyboard" }
+pic8259_simple = "0.1.1"
+raw-cpuid = "7.0.3"
 sha2 = { version = "0.8", default-features = false }
-hmac = { version = "0.7", default-features = false }
 smoltcp = { version = "0.6", default-features = false, features = ["alloc", "ethernet", "socket-tcp", "socket-udp", "proto-ipv4", "proto-dhcpv4"] }
-libm = "0.2.1"
+spin = "0.5.2"
+uart_16550 = "0.2.4"
+volatile = "0.2.6"
+x86_64 = "0.10.0"

src/kernel/allocator.rs

@@ -13,7 +13,7 @@ pub const HEAP_SIZE: usize = 100 * 1024; // 100 KiB
 #[global_allocator]
 static ALLOCATOR: LockedHeap = LockedHeap::empty();
 
-pub fn init_heap(mapper: &mut impl Mapper<Size4KiB>, frame_allocator: &mut impl FrameAllocator<Size4KiB>) -> Result<(), MapToError> {
+pub fn init_heap(mapper: &mut impl Mapper<Size4KiB>, frame_allocator: &mut impl FrameAllocator<Size4KiB>) -> Result<(), MapToError<Size4KiB>> {
     let page_range = {
         let heap_start = VirtAddr::new(HEAP_START as u64);
         let heap_end = heap_start + HEAP_SIZE - 1u64;
@@ -25,7 +25,9 @@ pub fn init_heap(mapper: &mut impl Mapper<Size4KiB>, frame_allocator: &mut impl
     for page in page_range {
         let frame = frame_allocator.allocate_frame().ok_or(MapToError::FrameAllocationFailed)?;
         let flags = PageTableFlags::PRESENT | PageTableFlags::WRITABLE;
-        mapper.map_to(page, frame, flags, frame_allocator)?.flush();
+        unsafe {
+            mapper.map_to(page, frame, flags, frame_allocator)?.flush();
+        }
     }
 
     unsafe {

src/kernel/mem.rs

@@ -3,7 +3,7 @@ use crate::{log, kernel};
 use lazy_static::lazy_static;
 use spin::Mutex;
 use x86_64::structures::paging::mapper::MapperAllSizes;
-use x86_64::structures::paging::{FrameAllocator, OffsetPageTable, PageTable, PhysFrame, Size4KiB, UnusedPhysFrame};
+use x86_64::structures::paging::{FrameAllocator, OffsetPageTable, PageTable, PhysFrame, Size4KiB};
 use x86_64::{PhysAddr, VirtAddr};
 
 lazy_static! {
@@ -64,18 +64,17 @@ impl BootInfoFrameAllocator {
         }
     }
 
-    fn usable_frames(&self) -> impl Iterator<Item = UnusedPhysFrame> {
+    fn usable_frames(&self) -> impl Iterator<Item = PhysFrame> {
         let regions = self.memory_map.iter();
         let usable_regions = regions.filter(|r| r.region_type == MemoryRegionType::Usable);
         let addr_ranges = usable_regions.map(|r| r.range.start_addr()..r.range.end_addr());
         let frame_addresses = addr_ranges.flat_map(|r| r.step_by(4096));
-        let frames = frame_addresses.map(|addr| PhysFrame::containing_address(PhysAddr::new(addr)));
-        frames.map(|f| unsafe { UnusedPhysFrame::new(f) })
+        frame_addresses.map(|addr| PhysFrame::containing_address(PhysAddr::new(addr)))
     }
 }
 
 unsafe impl FrameAllocator<Size4KiB> for BootInfoFrameAllocator {
-    fn allocate_frame(&mut self) -> Option<UnusedPhysFrame> {
+    fn allocate_frame(&mut self) -> Option<PhysFrame> {
         let frame = self.usable_frames().nth(self.next);
         self.next += 1;
         frame