chore(rust): upgrade rust to edition 2024

Author: GZTimeWalker

docs/labs/0x04/tasks.md

@@ -93,7 +93,7 @@ entry!(main);
 #[macro_export]
 macro_rules! entry {
     ($fn:ident) => {
-        #[export_name = "_start"]
+        #[unsafe(export_name = "_start")]
         pub extern "C" fn __impl_start() {
             let ret = $fn();
             // FIXME: after syscall, add lib::sys_exit(ret);

docs/labs/0x07/tasks.md

@@ -696,8 +696,8 @@ pub fn init(boot_info: &'static BootInfo) {
     info!("Stack grow test done.");
 }
 
-#[no_mangle]
 #[inline(never)]
+#[unsafe(no_mangle)]
 pub fn grow_stack() {
     const STACK_SIZE: usize = 1024 * 4;
     const STEP: usize = 64;

docs/wiki/linux.md

@@ -82,16 +82,20 @@ wsl --install -d Ubuntu
 
     !!! tip "如果遇到了网络问题，请参考 [rsproxy.cn](https://rsproxy.cn/) 进行配置。"
 
+4. 按照仓库中的 `rust-toolchain` 文件，安装对应的 Rust 工具链。
+
+    !!! tip 第一次在拥有 `rust-toolchain.toml` 文件的目录下运行 `cargo` 命令时，Rustup 会自动安装对应的工具链。
+
 在安装完成后，请使用如下命令，确保你的相关软件包**不低于**如下标准：
 
 对于 Ubuntu 24.04：
 
 ```bash
 $ rustc --version
-rustc 1.84.1 (e71f9a9a9 2025-01-27)
+rustc 1.85.0 (4d91de4e4 2025-02-17)
 
 $ rustc +nightly --version
-rustc 1.86.0-nightly (124cc9219 2025-02-09)
+rustc 1.87.0-nightly (f04bbc60f 2025-02-20)
 
 $ qemu-system-x86_64 --version
 QEMU emulator version 8.2.2 (Debian 1:8.2.2+ds-0ubuntu1.4)
@@ -107,10 +111,10 @@ GNU gdb (Ubuntu 15.0.50.20240403-0ubuntu1) 15.0.50.20240403-git
 
 ```bash
 $ rustc --version
-rustc 1.84.1 (e71f9a9a9 2025-01-27)
+rustc 1.85.0 (4d91de4e4 2025-02-17)
 
 $ rustc +nightly --version
-rustc 1.86.0-nightly (124cc9219 2025-02-09)
+rustc 1.87.0-nightly (f04bbc60f 2025-02-20)
 
 $ qemu-system-x86_64 --version
 QEMU emulator version 6.2.0 (Debian 1:6.2+dfsg-2ubuntu6.15)

docs/wiki/rust.md

@@ -8,6 +8,8 @@ Rust 语言的基础语法可以参考 [Rust圣经](https://course.rs/) 或者 [
 
 当熟悉 Rust 的语法与特性后，可以尝试去完成 [Rustlings](https://github.com/rust-lang/rustlings) 的练习，这些练习可以帮助你更好的理解 Rust 语言的特性。
 
+本实验中使用的语言版本为 2024 版本，发布于 2025 年 2 月 20 日。
+
 其他可参考的学习资料：
 
 - [Rust 之旅（交互式课程）](https://tourofrust.com/00_zh-cn.html)

src/0x00/pkg/boot/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ysos_boot"
 version = "0.0.1"
-edition = "2021"
+edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

src/0x01/Cargo.toml

@@ -7,6 +7,10 @@ members = [
 ]
 exclude = ["pkg/app/config", "pkg/app/.cargo"]
 
+[workspace.package]
+version = "0.1.0"
+edition = "2024"
+
 [profile.release-with-debug]
 inherits = "release"
 debug = true

src/0x01/Makefile

@@ -75,6 +75,7 @@ $(ESP)/KERNEL.ELF: target/x86_64-unknown-none/$(PROFILE)/ysos_kernel
 	@mkdir -p $(@D)
 	cp $< $@
 
+
 target/x86_64-unknown-uefi/$(MODE)/ysos_boot.efi: pkg/boot
 	cd pkg/boot && cargo build $(BUILD_ARGS)
 

src/0x01/pkg/boot/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ysos_boot"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

src/0x01/pkg/boot/src/fs.rs

@@ -1,7 +1,7 @@
 use core::ptr::NonNull;
+use uefi::boot::*;
 use uefi::proto::media::file::*;
 use uefi::proto::media::fs::SimpleFileSystem;
-use uefi::boot::*;
 use xmas_elf::ElfFile;
 
 /// Open root directory

src/0x01/pkg/boot/src/lib.rs

@@ -1,10 +1,10 @@
 #![no_std]
 use core::arch::asm;
 
+pub use uefi::boot::{MemoryAttribute, MemoryDescriptor, MemoryType};
 pub use uefi::data_types::chars::*;
 pub use uefi::data_types::*;
 pub use uefi::proto::console::gop::{GraphicsOutput, ModeInfo};
-pub use uefi::boot::{MemoryAttribute, MemoryDescriptor, MemoryType};
 pub use uefi::Status;
 
 use arrayvec::ArrayVec;
@@ -53,8 +53,10 @@ static mut ENTRY: usize = 0;
 ///
 /// This function is unsafe because the caller must ensure that the kernel entry point is valid.
 pub unsafe fn jump_to_entry(bootinfo: *const BootInfo, stacktop: u64) -> ! {
-    assert!(ENTRY != 0, "ENTRY is not set");
-    asm!("mov rsp, {}; call {}", in(reg) stacktop, in(reg) ENTRY, in("rdi") bootinfo);
+    unsafe {
+        assert!(ENTRY != 0, "ENTRY is not set");
+        asm!("mov rsp, {}; call {}", in(reg) stacktop, in(reg) ENTRY, in("rdi") bootinfo);
+    }
     unreachable!()
 }
 
@@ -65,7 +67,9 @@ pub unsafe fn jump_to_entry(bootinfo: *const BootInfo, stacktop: u64) -> ! {
 /// This function is unsafe because the caller must ensure that the kernel entry point is valid.
 #[inline(always)]
 pub unsafe fn set_entry(entry: usize) {
-    ENTRY = entry;
+    unsafe {
+        ENTRY = entry;
+    }
 }
 
 /// This is copied from https://docs.rs/bootloader/0.10.12/src/bootloader/lib.rs.html
@@ -79,7 +83,7 @@ pub unsafe fn set_entry(entry: usize) {
 #[macro_export]
 macro_rules! entry_point {
     ($path:path) => {
-        #[export_name = "_start"]
+        #[unsafe(export_name = "_start")]
         pub extern "C" fn __impl_start(boot_info: &'static $crate::BootInfo) -> ! {
             // validate the signature of the program entry point
             let f: fn(&'static $crate::BootInfo) -> ! = $path;