Bump Rust version to nightly-2025-02-18(2024 Edition)

Author: wyfcyx

.github/workflows/doc-and-test.yml

@@ -4,7 +4,7 @@ on: [push]
 
 env:
   CARGO_TERM_COLOR: always
-  rust_toolchain: nightly-2024-01-18
+  rust_toolchain: nightly-2025-02-18
 
 jobs:
   build-doc:

os/Cargo.toml

@@ -2,7 +2,7 @@
 name = "os"
 version = "0.1.0"
 authors = ["Yifan Wu <[email protected]>"]
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

os/build.rs

@@ -1,4 +1,4 @@
-use std::fs::{read_dir, File};
+use std::fs::{File, read_dir};
 use std::io::{Result, Write};
 
 fn main() {

os/src/lang_items.rs

@@ -11,10 +11,10 @@ fn panic(info: &PanicInfo) -> ! {
             "[kernel] Panicked at {}:{} {}",
             location.file(),
             location.line(),
-            info.message().unwrap()
+            info.message()
         );
     } else {
-        error!("[kernel] Panicked: {}", info.message().unwrap());
+        error!("[kernel] Panicked: {}", info.message());
     }
     shutdown(true)
 }

os/src/loader.rs

@@ -55,17 +55,17 @@ fn get_base_i(app_id: usize) -> usize {
 
 /// Get the total number of applications.
 pub fn get_num_app() -> usize {
-    extern "C" {
-        fn _num_app();
+    unsafe extern "C" {
+        safe fn _num_app();
     }
     unsafe { (_num_app as usize as *const usize).read_volatile() }
 }
 
 /// Load nth user app at
 /// [APP_BASE_ADDRESS + n * APP_SIZE_LIMIT, APP_BASE_ADDRESS + (n+1) * APP_SIZE_LIMIT).
 pub fn load_apps() {
-    extern "C" {
-        fn _num_app();
+    unsafe extern "C" {
+        safe fn _num_app();
     }
     let num_app_ptr = _num_app as usize as *const usize;
     let num_app = get_num_app();

os/src/main.rs

@@ -19,7 +19,6 @@
 #![deny(warnings)]
 #![no_std]
 #![no_main]
-#![feature(panic_info_message)]
 
 use core::arch::global_asm;
 use log::*;
@@ -40,9 +39,9 @@ global_asm!(include_str!("link_app.S"));
 
 /// clear BSS segment
 fn clear_bss() {
-    extern "C" {
-        fn sbss();
-        fn ebss();
+    unsafe extern "C" {
+        safe fn sbss();
+        safe fn ebss();
     }
     unsafe {
         core::slice::from_raw_parts_mut(sbss as usize as *mut u8, ebss as usize - sbss as usize)
@@ -51,7 +50,7 @@ fn clear_bss() {
 }
 
 /// the rust entry-point of os
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub fn rust_main() -> ! {
     clear_bss();
     logging::init();

os/src/sbi.rs

@@ -15,7 +15,7 @@ pub fn console_getchar() -> usize {
 
 /// use sbi call to shutdown the kernel
 pub fn shutdown(failure: bool) -> ! {
-    use sbi_rt::{system_reset, NoReason, Shutdown, SystemFailure};
+    use sbi_rt::{NoReason, Shutdown, SystemFailure, system_reset};
     if !failure {
         system_reset(Shutdown, NoReason);
     } else {

os/src/task/context.rs

@@ -24,8 +24,8 @@ impl TaskContext {
 
     /// set task context {__restore ASM funciton, kernel stack, s_0..12 }
     pub fn goto_restore(kstack_ptr: usize) -> Self {
-        extern "C" {
-            fn __restore();
+        unsafe extern "C" {
+            unsafe fn __restore();
         }
         Self {
             ra: __restore as usize,

os/src/task/switch.rs

@@ -10,8 +10,11 @@ use core::arch::global_asm;
 
 global_asm!(include_str!("switch.S"));
 
-extern "C" {
+unsafe extern "C" {
     /// Switch to the context of `next_task_cx_ptr`, saving the current context
     /// in `current_task_cx_ptr`.
-    pub fn __switch(current_task_cx_ptr: *mut TaskContext, next_task_cx_ptr: *const TaskContext);
+    pub unsafe fn __switch(
+        current_task_cx_ptr: *mut TaskContext,
+        next_task_cx_ptr: *const TaskContext,
+    );
 }

os/src/trap/context.rs

@@ -1,4 +1,4 @@
-use riscv::register::sstatus::{self, Sstatus, SPP};
+use riscv::register::sstatus::{self, SPP, Sstatus};
 /// Trap Context
 #[repr(C)]
 pub struct TrapContext {