Upgrade toolchain to nightly-2025-05-20

Author: Azure-stars

.devcontainer/rust-toolchain.toml

@@ -1,6 +1,6 @@
 [toolchain]
 profile = "minimal"
-channel = "nightly-2025-01-18"
+channel = "nightly-2025-05-20"
 components = ["rust-src", "llvm-tools", "rustfmt", "clippy"]
 targets = [
     "x86_64-unknown-none",

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust-toolchain: [nightly, nightly-2025-01-18]
+        rust-toolchain: [nightly, nightly-2025-05-20]
         arch: [x86_64, riscv64, aarch64, loongarch64]
     steps:
     - uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64, loongarch64]
-        rust-toolchain: [nightly, nightly-2025-01-18]
+        rust-toolchain: [nightly, nightly-2025-05-20]
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
@@ -50,6 +50,9 @@ jobs:
         components: rust-src, llvm-tools
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat, loongarch64-unknown-none
     - uses: Swatinem/rust-cache@v2
+      with:
+        shared-key: cargo-bin-cache
+        cache-targets: false
     - run: cargo install cargo-binutils
     - run: ./scripts/get_deps.sh
     - uses: arceos-org/setup-musl@v1
@@ -66,14 +69,17 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64, loongarch64]
-        rust-toolchain: [nightly-2025-01-18]
+        rust-toolchain: [nightly-2025-05-20]
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, llvm-tools
     - uses: Swatinem/rust-cache@v2
+      with:
+        shared-key: cargo-bin-cache
+        cache-targets: false
     - run: cargo install cargo-binutils
     - run: ./scripts/get_deps.sh
     - uses: arceos-org/setup-musl@v1
@@ -96,14 +102,17 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64, loongarch64]
-        rust-toolchain: [nightly-2025-01-18]
+        rust-toolchain: [nightly-2025-05-20]
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, llvm-tools
     - uses: Swatinem/rust-cache@v2
+      with:
+        shared-key: cargo-bin-cache
+        cache-targets: false
     - run: cargo install cargo-binutils
     - run: ./scripts/get_deps.sh
     - uses: arceos-org/setup-musl@v1

.github/workflows/docs.yml

@@ -3,7 +3,7 @@ name: Build & Deploy docs
 on: [push, pull_request]
 
 env:
-  rust-toolchain: nightly-2025-01-18
+  rust-toolchain: nightly-2025-05-20
 
 jobs:
   doc:
@@ -20,6 +20,9 @@ jobs:
       with:
         toolchain: ${{ env.rust-toolchain }}
     - uses: Swatinem/rust-cache@v2
+      with:
+        shared-key: cargo-bin-cache
+        cache-targets: false
     - run: cargo install cargo-binutils
     - run: ./scripts/get_deps.sh
     - uses: arceos-org/setup-musl@v1

Cargo.lock

@@ -139,11 +139,11 @@ pub fn sys_getdents64(fd: i32, buf: UserPtr<u8>, len: usize) -> LinuxResult<isiz
     let dir = Directory::from_fd(fd)?;
 
     let mut last_dirent = dir.last_dirent();
-    if let Some(ent) = last_dirent.take() {
-        if !buffer.write_entry(ent.entry_type().into(), ent.name_as_bytes()) {
-            *last_dirent = Some(ent);
-            return Err(LinuxError::EINVAL);
-        }
+    if let Some(ent) = last_dirent.take()
+        && !buffer.write_entry(ent.entry_type().into(), ent.name_as_bytes())
+    {
+        *last_dirent = Some(ent);
+        return Err(LinuxError::EINVAL);
     }
 
     let mut inner = dir.inner();

api/src/imp/fs/ctl.rs

@@ -1,5 +1,5 @@
 [toolchain]
 profile = "minimal"
 # use the nightly version of the last stable toolchain, see <https://forge.rust-lang.org/>
-channel = "nightly-2025-01-18"
+channel = "nightly-2025-05-20"
 components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]

apps/nimbos/rust/rust-toolchain.toml

@@ -16,7 +16,7 @@ pub fn syscall(id: usize, args: [usize; 3]) -> isize {
     ret
 }
 
-#[naked]
+#[unsafe(naked)]
 #[allow(improper_ctypes_definitions)]
 pub extern "C" fn sys_clone(_entry: fn(usize) -> i32, _arg: usize, _newsp: usize) -> isize {
     // sys_clone(entry, arg, newsp)

apps/nimbos/rust/src/arch/aarch64.rs

@@ -16,7 +16,7 @@ pub fn syscall(id: usize, args: [usize; 3]) -> isize {
     ret
 }
 
-#[naked]
+#[unsafe(naked)]
 #[allow(improper_ctypes_definitions)]
 pub extern "C" fn sys_clone(_entry: fn(usize) -> i32, _arg: usize, _newsp: usize) -> isize {
     // sys_clone(entry, arg, newsp)

apps/nimbos/rust/src/arch/riscv.rs

@@ -18,7 +18,7 @@ pub fn syscall(id: usize, args: [usize; 3]) -> isize {
     ret
 }
 
-#[naked]
+#[unsafe(naked)]
 #[allow(improper_ctypes_definitions)]
 pub extern "C" fn sys_clone(_entry: fn(usize) -> i32, _arg: usize, _newsp: usize) -> isize {
     // sys_clone(entry, arg, newsp)

apps/nimbos/rust/src/arch/x86_64.rs

@@ -13,7 +13,7 @@ fn main() {
 fn link_app_data(arch: &str) -> Result<()> {
     let testcase = option_env!("AX_TESTCASE").unwrap_or("nimbos");
 
-    let app_path = PathBuf::from(format!("apps/{}/build/{}", testcase, arch));
+    let app_path = PathBuf::from(format!("apps/{testcase}/build/{arch}"));
     let link_app_path = PathBuf::from(std::env::var("OUT_DIR").unwrap()).join("link_app.S");
 
     if let Ok(dir) = read_dir(&app_path) {
@@ -35,8 +35,8 @@ _app_count:
             apps.len()
         )?;
         for i in 0..apps.len() {
-            writeln!(f, "    .quad app_{}_name", i)?;
-            writeln!(f, "    .quad app_{}_start", i)?;
+            writeln!(f, "    .quad app_{i}_name")?;
+            writeln!(f, "    .quad app_{i}_start")?;
         }
         writeln!(f, "    .quad app_{}_end", apps.len() - 1)?;