Fix all warnings, lints, etc

Signed-off-by: Graham MacDonald <[email protected]>

aarch64/src/init.rs

@@ -5,7 +5,6 @@ use crate::kmem::heap_virtrange;
 use crate::mailbox;
 use crate::pagealloc;
 use crate::registers;
-use crate::runtime;
 use crate::trap;
 use crate::vm;
 use crate::vm::kernel_root;
@@ -81,6 +80,11 @@ fn print_board_info() {
     println!("  Firmware Rev:\t{fw_revision:#010x}");
 }
 
+fn enable_bump_allocator() {
+    #[cfg(not(test))]
+    crate::runtime::enable_bump_allocator();
+}
+
 /// This function is concerned with preparing the system to the point where an
 /// allocator can be set up and allocation is available.  We can't assume
 /// there's any allocator available when executing this function.
@@ -118,7 +122,7 @@ pub fn init(dtb_va: usize) {
     // bump allocator that makes permanent allocations.  This can be used to
     // create the more complex vmem allocator.  Once the vmem allocator is
     // available, we switch to that.
-    runtime::enable_bump_allocator();
+    enable_bump_allocator();
 
     vmalloc::init(heap_virtrange());
     //runtime::enable_vmem_allocator();

aarch64/src/main.rs

@@ -23,6 +23,7 @@ mod mailbox;
 mod pagealloc;
 mod param;
 mod registers;
+mod runtime;
 mod trap;
 mod uartmini;
 mod uartpl011;
@@ -42,5 +43,3 @@ core::arch::global_asm!(include_str!("l.S"));
 pub extern "C" fn main9(dtb_va: usize) {
     init(dtb_va);
 }
-
-mod runtime;

riscv64/Cargo.toml

@@ -11,3 +11,8 @@ port = { path = "../port" }
 
 [features]
 opensbi = []
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(platform, values("nezha", "virt"))',
+] }

riscv64/src/main.rs

@@ -1,6 +1,5 @@
 #![feature(alloc_error_handler)]
 #![feature(asm_const)]
-#![feature(panic_info_message)]
 #![cfg_attr(not(any(test)), no_std)]
 #![cfg_attr(not(test), no_main)]
 #![allow(clippy::upper_case_acronyms)]

riscv64/src/runtime.rs

@@ -18,7 +18,7 @@ extern "C" fn eh_personality() {}
 fn panic(info: &PanicInfo) -> ! {
     print!("Panic: ");
     if let Some(p) = info.location() {
-        println!("line {}, file {}: {}", p.line(), p.file(), info.message().unwrap());
+        println!("line {}, file {}: {}", p.line(), p.file(), info.message());
     } else {
         println!("no information available.");
     }