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

wyfcyx · wyfcyx · commit 419a5765ce9a · 2025-02-19T22:17:47.000+08:00
diff --git a/.github/workflows/doc-and-test.yml b/.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:
diff --git a/os/Cargo.toml b/os/Cargo.toml
@@ -2,7 +2,7 @@
 name = "os"
 version = "0.1.0"
 authors = ["Yifan Wu <shinbokuow@163.com>"]
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/os/build.rs b/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() {
diff --git a/os/src/lang_items.rs b/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)
 }
diff --git a/os/src/loader.rs b/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();
diff --git a/os/src/main.rs b/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::*;
@@ -45,9 +44,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)
@@ -56,7 +55,7 @@ fn clear_bss() {
 }
 
 /// the rust entry-point of os
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub fn rust_main() -> ! {
     clear_bss();
     logging::init();
diff --git a/os/src/sbi.rs b/os/src/sbi.rs
@@ -13,7 +13,7 @@ pub fn set_timer(timer: 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 {
diff --git a/os/src/task/context.rs b/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,
diff --git a/os/src/task/switch.rs b/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,
+    );
 }
diff --git a/os/src/trap/context.rs b/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 {
diff --git a/os/src/trap/mod.rs b/os/src/trap/mod.rs
@@ -28,8 +28,8 @@ 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);
@@ -43,7 +43,7 @@ pub fn enable_timer_interrupt() {
     }
 }
 
-#[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
@@ -54,7 +54,10 @@ pub fn trap_handler(cx: &mut TrapContext) -> &mut TrapContext {
             cx.x[10] = syscall(cx.x[17], [cx.x[10], cx.x[11], cx.x[12]]) as usize;
         }
         Trap::Exception(Exception::StoreFault) | Trap::Exception(Exception::StorePageFault) => {
-            println!("[kernel] PageFault in application, bad addr = {:#x}, bad instruction = {:#x}, kernel killed it.", stval, cx.sepc);
+            println!(
+                "[kernel] PageFault in application, bad addr = {:#x}, bad instruction = {:#x}, kernel killed it.",
+                stval, cx.sepc
+            );
             exit_current_and_run_next();
         }
         Trap::Exception(Exception::IllegalInstruction) => {
diff --git a/rust-toolchain.toml b/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"]
diff --git a/user/Cargo.toml b/user/Cargo.toml
@@ -2,7 +2,7 @@
 name = "user_lib"
 version = "0.1.0"
 authors = ["Yifan Wu <shinbokuow@163.com>"]
-edition = "2018"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/user/src/bin/00power_3.rs b/user/src/bin/00power_3.rs
@@ -6,7 +6,7 @@ extern crate user_lib;
 
 const LEN: usize = 100;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     let p = 3u64;
     let m = 998244353u64;
diff --git a/user/src/bin/01power_5.rs b/user/src/bin/01power_5.rs
@@ -6,7 +6,7 @@ extern crate user_lib;
 
 const LEN: usize = 100;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     let p = 5u64;
     let m = 998244353u64;
diff --git a/user/src/bin/02power_7.rs b/user/src/bin/02power_7.rs
@@ -6,7 +6,7 @@ extern crate user_lib;
 
 const LEN: usize = 100;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     let p = 7u64;
     let m = 998244353u64;
diff --git a/user/src/bin/03sleep.rs b/user/src/bin/03sleep.rs
@@ -6,7 +6,7 @@ extern crate user_lib;
 
 use user_lib::{get_time, yield_};
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn main() -> i32 {
     let current_timer = get_time();
     let wait_for = current_timer + 3000;
diff --git a/user/src/lang_items.rs b/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 {}:{}, {}",
diff --git a/user/src/lib.rs b/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);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use std::fs::{read_dir, File};`
	`1`	`+use std::fs::{File, read_dir};`
`2`	`2`	`use std::io::{Result, Write};`
`3`	`3`
`4`	`4`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ fn panic(info: &PanicInfo) -> ! {`
`11`	`11`	`"[kernel] Panicked at {}:{} {}",`
`12`	`12`	`location.file(),`
`13`	`13`	`location.line(),`
`14`		`- info.message().unwrap()`
	`14`	`+ info.message()`
`15`	`15`	`);`
`16`	`16`	`} else {`
`17`		`- error!("[kernel] Panicked: {}", info.message().unwrap());`
	`17`	`+ error!("[kernel] Panicked: {}", info.message());`
`18`	`18`	`}`
`19`	`19`	`shutdown(true)`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use riscv::register::sstatus::{self, Sstatus, SPP};`
	`1`	`+use riscv::register::sstatus::{self, SPP, Sstatus};`
`2`	`2`	`/// Trap Context`
`3`	`3`	`#[repr(C)]`
`4`	`4`	`pub struct TrapContext {`