Fix some more warnings

Author: phil-opp

bios/stage-2/src/dap.rs

@@ -1,6 +1,7 @@
 use core::arch::asm;
 
 #[derive(Debug, Clone, Copy)]
+#[allow(dead_code)]
 #[repr(packed)]
 pub struct DiskAddressPacket {
     /// Size of the DAP structure

bios/stage-2/src/disk.rs

@@ -65,12 +65,6 @@ impl Seek for DiskAccess {
                 self.current_offset = offset;
                 self.current_offset
             }
-            SeekFrom::Current(offset) => {
-                self.current_offset = (i64::try_from(self.current_offset).unwrap() + offset)
-                    .try_into()
-                    .unwrap();
-                self.current_offset
-            }
         }
     }
 }
@@ -83,7 +77,6 @@ pub trait Read {
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SeekFrom {
     Start(u64),
-    Current(i64),
 }
 
 pub trait Seek {

bios/stage-2/src/fat.rs

@@ -1,7 +1,7 @@
 // based on https://crates.io/crates/mini_fat by https://github.com/gridbugs
 
 use crate::disk::{AlignedBuffer, Read, Seek, SeekFrom};
-use core::{char::DecodeUtf16Error, fmt::Write as _};
+use core::char::DecodeUtf16Error;
 
 const DIRECTORY_ENTRY_BYTES: usize = 32;
 const UNUSED_ENTRY_PREFIX: u8 = 0xE5;
@@ -312,6 +312,7 @@ impl FatType {
     }
 }
 
+#[allow(dead_code)]
 #[derive(Clone)]
 pub struct DirectoryEntry<'a> {
     short_name: &'a str,
@@ -325,37 +326,6 @@ pub struct DirectoryEntry<'a> {
 }
 
 impl<'a> DirectoryEntry<'a> {
-    pub fn name(&self) -> impl Iterator<Item = Result<char, DecodeUtf16Error>> + 'a {
-        let mut long_name = {
-            let iter = self
-                .long_name_1
-                .chunks(2)
-                .chain(self.long_name_2.chunks(2))
-                .chain(self.long_name_3.chunks(2))
-                .map(|c| u16::from_le_bytes(c.try_into().unwrap()))
-                .take_while(|&c| c != 0);
-            char::decode_utf16(iter).peekable()
-        };
-        let short_name = {
-            let iter = self.short_name.chars();
-            let extension_iter = {
-                let raw = ".".chars().chain(self.short_name_extension.chars());
-                raw.take(if self.short_name_extension.is_empty() {
-                    0
-                } else {
-                    self.short_name_extension.len() + 1
-                })
-            };
-            iter.chain(extension_iter).map(Ok)
-        };
-
-        if long_name.peek().is_some() {
-            long_name.chain(short_name.take(0))
-        } else {
-            long_name.chain(short_name.take(usize::MAX))
-        }
-    }
-
     pub fn is_directory(&self) -> bool {
         self.attributes & directory_attributes::DIRECTORY != 0
     }
@@ -370,6 +340,7 @@ struct RawDirectoryEntryNormal<'a> {
     file_size: u32,
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 struct RawDirectoryEntryLongName<'a> {
     order: u8,

bios/stage-2/src/main.rs

@@ -2,7 +2,7 @@
 #![no_main]
 
 use crate::{
-    disk::{AlignedBuffer, Read, Seek, SeekFrom},
+    disk::{Read, Seek, SeekFrom},
     protected_mode::{
         copy_to_protected_mode, enter_protected_mode_and_jump_to_stage_3, enter_unreal_mode,
     },
@@ -28,14 +28,6 @@ const STAGE_3_DST: *mut u8 = 0x0010_0000 as *mut u8; // 1MiB (typically 14MiB ac
 const STAGE_4_DST: *mut u8 = 0x0020_0000 as *mut u8; // 2MiB (typically still 13MiB accessible here)
 const KERNEL_DST: *mut u8 = 0x0100_0000 as *mut u8; // 16MiB
 
-extern "C" {
-    static _second_stage_end: u8;
-}
-
-fn second_stage_end() -> *const u8 {
-    unsafe { &_second_stage_end }
-}
-
 static mut DISK_BUFFER: AlignedArrayBuffer<0x4000> = AlignedArrayBuffer {
     buffer: [0; 0x4000],
 };

bios/stage-2/src/screen.rs

@@ -1,4 +1,4 @@
-use core::{arch::asm, fmt::Write as _};
+use core::{arch::asm, fmt::Write};
 
 pub fn print_char(c: u8) {
     let ax = u16::from(c) | 0x0e00;
@@ -20,15 +20,9 @@ pub fn print_str(s: &str) {
     }
 }
 
-fn hlt() {
-    unsafe {
-        asm!("hlt");
-    }
-}
-
 pub struct Writer;
 
-impl core::fmt::Write for Writer {
+impl Write for Writer {
     fn write_str(&mut self, s: &str) -> core::fmt::Result {
         print_str(s);
         Ok(())
@@ -41,6 +35,8 @@ pub fn panic(info: &core::panic::PanicInfo) -> ! {
     let _ = writeln!(Writer, "\nPANIC: {}", info);
 
     loop {
-        hlt();
+        unsafe {
+            asm!("hlt");
+        };
     }
 }