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/batch.rs

@@ -67,27 +67,30 @@ impl AppManager {
         }
     }
 
-    unsafe fn load_app(&self, app_id: usize) {
+    fn load_app(&self, app_id: usize) {
         if app_id >= self.num_app {
             println!("All applications completed!");
             shutdown(false);
         }
         println!("[kernel] Loading app_{}", app_id);
-        // clear app area
-        core::slice::from_raw_parts_mut(APP_BASE_ADDRESS as *mut u8, APP_SIZE_LIMIT).fill(0);
-        let app_src = core::slice::from_raw_parts(
-            self.app_start[app_id] as *const u8,
-            self.app_start[app_id + 1] - self.app_start[app_id],
-        );
-        let app_dst = core::slice::from_raw_parts_mut(APP_BASE_ADDRESS as *mut u8, app_src.len());
-        app_dst.copy_from_slice(app_src);
-        // Memory fence about fetching the instruction memory
-        // It is guaranteed that a subsequent instruction fetch must
-        // observes all previous writes to the instruction memory.
-        // Therefore, fence.i must be executed after we have loaded
-        // the code of the next app into the instruction memory.
-        // See also: riscv non-priv spec chapter 3, 'Zifencei' extension.
-        asm!("fence.i");
+        unsafe {
+            // clear app area
+            core::slice::from_raw_parts_mut(APP_BASE_ADDRESS as *mut u8, APP_SIZE_LIMIT).fill(0);
+            let app_src = core::slice::from_raw_parts(
+                self.app_start[app_id] as *const u8,
+                self.app_start[app_id + 1] - self.app_start[app_id],
+            );
+            let app_dst =
+                core::slice::from_raw_parts_mut(APP_BASE_ADDRESS as *mut u8, app_src.len());
+            app_dst.copy_from_slice(app_src);
+            // Memory fence about fetching the instruction memory
+            // It is guaranteed that a subsequent instruction fetch must
+            // observes all previous writes to the instruction memory.
+            // Therefore, fence.i must be executed after we have loaded
+            // the code of the next app into the instruction memory.
+            // See also: riscv non-priv spec chapter 3, 'Zifencei' extension.
+            asm!("fence.i");
+        }
     }
 
     pub fn get_current_app(&self) -> usize {
@@ -102,8 +105,8 @@ impl AppManager {
 lazy_static! {
     static ref APP_MANAGER: UPSafeCell<AppManager> = unsafe {
         UPSafeCell::new({
-            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 = num_app_ptr.read_volatile();
@@ -134,15 +137,13 @@ pub fn print_app_info() {
 pub fn run_next_app() -> ! {
     let mut app_manager = APP_MANAGER.exclusive_access();
     let current_app = app_manager.get_current_app();
-    unsafe {
-        app_manager.load_app(current_app);
-    }
+    app_manager.load_app(current_app);
     app_manager.move_to_next_app();
     drop(app_manager);
     // before this we have to drop local variables related to resources manually
     // and release the resources
-    extern "C" {
-        fn __restore(cx_addr: usize);
+    unsafe extern "C" {
+        unsafe fn __restore(cx_addr: usize);
     }
     unsafe {
         __restore(KERNEL_STACK.push_context(TrapContext::app_init_context(

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/main.rs

@@ -18,7 +18,6 @@
 #![deny(warnings)]
 #![no_std]
 #![no_main]
-#![feature(panic_info_message)]
 
 use core::arch::global_asm;
 
@@ -38,9 +37,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)
@@ -49,27 +48,26 @@ fn clear_bss() {
 }
 
 /// the rust entry-point of os
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub fn rust_main() -> ! {
-    extern "C" {
-        fn stext(); // begin addr of text segment
-        fn etext(); // end addr of text segment
-        fn srodata(); // start addr of Read-Only data segment
-        fn erodata(); // end addr of Read-Only data ssegment
-        fn sdata(); // start addr of data segment
-        fn edata(); // end addr of data segment
-        fn sbss(); // start addr of BSS segment
-        fn ebss(); // end addr of BSS segment
-        fn boot_stack_lower_bound(); // stack lower bound
-        fn boot_stack_top(); // stack top
+    unsafe extern "C" {
+        safe fn stext(); // begin addr of text segment
+        safe fn etext(); // end addr of text segment
+        safe fn srodata(); // start addr of Read-Only data segment
+        safe fn erodata(); // end addr of Read-Only data ssegment
+        safe fn sdata(); // start addr of data segment
+        safe fn edata(); // end addr of data segment
+        safe fn sbss(); // start addr of BSS segment
+        safe fn ebss(); // end addr of BSS segment
+        safe fn boot_stack_lower_bound(); // stack lower bound
+        safe fn boot_stack_top(); // stack top
     }
     clear_bss();
     logging::init();
     println!("[kernel] Hello, world!");
     trace!(
         "[kernel] .text [{:#x}, {:#x})",
-        stext as usize,
-        etext as usize
+        stext as usize, etext as usize
     );
     debug!(
         "[kernel] .rodata [{:#x}, {:#x})",

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/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 {

os/src/trap/mod.rs

@@ -27,15 +27,15 @@ global_asm!(include_str!("trap.S"));
 
 /// initialize CSR `stvec` as the entry of `__alltraps`
 pub fn init() {
-    extern "C" {
-        fn __alltraps();
+    unsafe extern "C" {
+        safe fn __alltraps();
     }
     unsafe {
         stvec::write(__alltraps as usize, TrapMode::Direct);
     }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 /// handle an interrupt, exception, or system call from user space
 pub fn trap_handler(cx: &mut TrapContext) -> &mut TrapContext {
     let scause = scause::read(); // get trap cause

rust-toolchain.toml

@@ -1,6 +1,6 @@
 [toolchain]
 profile = "minimal"
 # use the nightly version of the last stable toolchain, see <https://forge.rust-lang.org/>
-channel = "nightly-2024-05-01"
+channel = "nightly-2025-02-18"
 components = ["rust-src", "llvm-tools", "rustfmt", "clippy"]
 targets = ["riscv64gc-unknown-none-elf"]

user/Cargo.toml

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

user/src/bin/00hello_world.rs

@@ -4,7 +4,7 @@
 #[macro_use]
 extern crate user_lib;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     println!("Hello, world!");
     0

user/src/bin/01store_fault.rs

@@ -4,7 +4,7 @@
 #[macro_use]
 extern crate user_lib;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     println!("Into Test store_fault, we will insert an invalid store operation...");
     println!("Kernel should kill this application!");

user/src/bin/02power.rs

@@ -9,7 +9,7 @@ const P: u32 = 3;
 const STEP: usize = 100000;
 const MOD: u32 = 10007;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     let mut pow = [0u32; SIZE];
     let mut index: usize = 0;

user/src/bin/03priv_inst.rs

@@ -6,7 +6,7 @@ extern crate user_lib;
 
 use core::arch::asm;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     println!("Try to execute privileged instruction in U Mode");
     println!("Kernel should kill this application!");

user/src/bin/04priv_csr.rs

@@ -6,7 +6,7 @@ extern crate user_lib;
 
 use riscv::register::sstatus::{self, SPP};
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     println!("Try to access privileged CSR in U Mode");
     println!("Kernel should kill this application!");

user/src/lang_items.rs

@@ -1,6 +1,6 @@
 #[panic_handler]
 fn panic_handler(panic_info: &core::panic::PanicInfo) -> ! {
-    let err = panic_info.message().unwrap();
+    let err = panic_info.message();
     if let Some(location) = panic_info.location() {
         println!(
             "Panicked at {}:{}, {}",

user/src/lib.rs

@@ -1,30 +1,29 @@
 #![no_std]
 #![feature(linkage)]
-#![feature(panic_info_message)]
 
 #[macro_use]
 pub mod console;
 mod lang_items;
 mod syscall;
 
-#[no_mangle]
-#[link_section = ".text.entry"]
+#[unsafe(no_mangle)]
+#[unsafe(link_section = ".text.entry")]
 pub extern "C" fn _start() -> ! {
     clear_bss();
     exit(main());
     panic!("unreachable after sys_exit!");
 }
 
 #[linkage = "weak"]
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     panic!("Cannot find main!");
 }
 
 fn clear_bss() {
-    extern "C" {
-        fn start_bss();
-        fn end_bss();
+    unsafe extern "C" {
+        safe fn start_bss();
+        safe fn end_bss();
     }
     (start_bss as usize..end_bss as usize).for_each(|addr| unsafe {
         (addr as *mut u8).write_volatile(0);