Migrate to Rust Edition 2024

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust-toolchain: [nightly, nightly-2024-05-02]
+        rust-toolchain: [nightly, nightly-2024-12-12]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -43,7 +43,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64]
-        rust-toolchain: [nightly, nightly-2024-05-02]
+        rust-toolchain: [nightly, nightly-2024-12-12]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -87,7 +87,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        rust-toolchain: [nightly, nightly-2024-05-02]
+        rust-toolchain: [nightly, nightly-2024-12-12]
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable

.github/workflows/docs.yml

@@ -3,7 +3,7 @@ name: Build & Deploy docs
 on: [push, pull_request]
 
 env:
-  rust-toolchain: nightly-2024-05-02
+  rust-toolchain: nightly-2024-12-12
 
 jobs:
   doc:

.github/workflows/test.yml

@@ -4,8 +4,8 @@ on: [push, pull_request]
 
 env:
   qemu-version: 8.2.0
-  rust-toolchain: nightly-2024-05-02
-  arceos-apps: 'da1caa5'
+  rust-toolchain: nightly-2024-12-12
+  arceos-apps: '57c8074'
 
 jobs:
   unit-test:

Cargo.toml

@@ -32,6 +32,7 @@ members = [
 
 [workspace.package]
 version = "0.1.0"
+edition = "2024"
 authors = ["Yuekai Jia <[email protected]>"]
 license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0"
 homepage = "https://github.com/arceos-org/arceos"

README.md

@@ -134,7 +134,7 @@ Examples are given below and in the [app-helloworld](https://github.com/arceos-o
 
 3. Call library functions from `axstd` in your code, just like the Rust [std](https://doc.rust-lang.org/std/) library.
 
-    Remember to annotate the `main` function with `#[no_mangle]` (see this [example](examples/helloworld/src/main.rs)).
+    Remember to annotate the `main` function with `#[unsafe(no_mangle)]` (see this [example](examples/helloworld/src/main.rs)).
 
 4. Build your application with ArceOS, by running the `make` command in the application directory:
 

api/arceos_api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "arceos_api"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "Public APIs and types for ArceOS modules"
 license.workspace = true

api/arceos_api/src/imp/mod.rs

@@ -41,7 +41,7 @@ mod stdio {
 
 mod time {
     pub use axhal::time::{
-        monotonic_time as ax_monotonic_time, wall_time as ax_wall_time, TimeValue as AxTimeValue,
+        TimeValue as AxTimeValue, monotonic_time as ax_monotonic_time, wall_time as ax_wall_time,
     };
 }
 

api/arceos_api/src/lib.rs

@@ -265,7 +265,7 @@ pub mod fs {
 
 /// Networking primitives for TCP/UDP communication.
 pub mod net {
-    use crate::{io::AxPollState, AxResult};
+    use crate::{AxResult, io::AxPollState};
     use core::net::{IpAddr, SocketAddr};
 
     define_api_type! {

api/arceos_posix_api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "arceos_posix_api"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = [
     "Yuekai Jia <[email protected]>",
     "yanjuguang <[email protected]>",
@@ -46,7 +46,7 @@ axnet = { workspace = true, optional = true }
 # Other crates
 axio = "0.1"
 axerrno = "0.1"
-flatten_objects = "0.1"
+flatten_objects = "0.2"
 static_assertions = "1.1.0"
 spin = { version = "0.9" }
 lazy_static = { version = "1.5", features = ["spin_no_std"] }

api/arceos_posix_api/src/imp/fd_ops.rs

@@ -24,9 +24,9 @@ pub trait FileLike: Send + Sync {
 lazy_static::lazy_static! {
     static ref FD_TABLE: RwLock<FlattenObjects<Arc<dyn FileLike>, AX_FILE_LIMIT>> = {
         let mut fd_table = FlattenObjects::new();
-        fd_table.add_at(0, Arc::new(stdin()) as _).unwrap(); // stdin
-        fd_table.add_at(1, Arc::new(stdout()) as _).unwrap(); // stdout
-        fd_table.add_at(2, Arc::new(stdout()) as _).unwrap(); // stderr
+        fd_table.add_at(0, Arc::new(stdin()) as _).unwrap_or_else(|_| panic!()); // stdin
+        fd_table.add_at(1, Arc::new(stdout()) as _).unwrap_or_else(|_| panic!()); // stdout
+        fd_table.add_at(2, Arc::new(stdout()) as _).unwrap_or_else(|_| panic!()); // stderr
         RwLock::new(fd_table)
     };
 }
@@ -40,7 +40,7 @@ pub fn get_file_like(fd: c_int) -> LinuxResult<Arc<dyn FileLike>> {
 }
 
 pub fn add_file_like(f: Arc<dyn FileLike>) -> LinuxResult<c_int> {
-    Ok(FD_TABLE.write().add(f).ok_or(LinuxError::EMFILE)? as c_int)
+    Ok(FD_TABLE.write().add(f).map_err(|_| LinuxError::EMFILE)? as c_int)
 }
 
 pub fn close_file_like(fd: c_int) -> LinuxResult {
@@ -95,7 +95,7 @@ pub fn sys_dup2(old_fd: c_int, new_fd: c_int) -> c_int {
         FD_TABLE
             .write()
             .add_at(new_fd as usize, f)
-            .ok_or(LinuxError::EMFILE)?;
+            .map_err(|_| LinuxError::EMFILE)?;
 
         Ok(new_fd)
     })

api/arceos_posix_api/src/imp/fs.rs

@@ -6,7 +6,7 @@ use axfs::fops::OpenOptions;
 use axio::{PollState, SeekFrom};
 use axsync::Mutex;
 
-use super::fd_ops::{get_file_like, FileLike};
+use super::fd_ops::{FileLike, get_file_like};
 use crate::{ctypes, utils::char_ptr_to_str};
 
 pub struct File {
@@ -183,6 +183,7 @@ pub unsafe fn sys_lstat(path: *const c_char, buf: *mut ctypes::stat) -> ctypes::
 }
 
 /// Get the path of the current directory.
+#[allow(clippy::unnecessary_cast)] // `c_char` is either `i8` or `u8`
 pub fn sys_getcwd(buf: *mut c_char, size: usize) -> *mut c_char {
     debug!("sys_getcwd <= {:#x} {}", buf as usize, size);
     syscall_body!(sys_getcwd, {

api/arceos_posix_api/src/imp/io_mpx/epoll.rs

@@ -2,8 +2,8 @@
 //!
 //! TODO: do not support `EPOLLET` flag
 
-use alloc::collections::btree_map::Entry;
 use alloc::collections::BTreeMap;
+use alloc::collections::btree_map::Entry;
 use alloc::sync::Arc;
 use core::{ffi::c_int, time::Duration};
 
@@ -12,7 +12,7 @@ use axhal::time::wall_time;
 use axsync::Mutex;
 
 use crate::ctypes;
-use crate::imp::fd_ops::{add_file_like, get_file_like, FileLike};
+use crate::imp::fd_ops::{FileLike, add_file_like, get_file_like};
 
 pub struct EpollInstance {
     events: Mutex<BTreeMap<usize, ctypes::epoll_event>>,
@@ -195,7 +195,7 @@ pub unsafe fn sys_epoll_wait(
                 return Ok(events_num as c_int);
             }
 
-            if deadline.map_or(false, |ddl| wall_time() >= ddl) {
+            if deadline.is_some_and(|ddl| wall_time() >= ddl) {
                 debug!("    timeout!");
                 return Ok(0);
             }

api/arceos_posix_api/src/imp/io_mpx/select.rs

@@ -141,7 +141,7 @@ pub unsafe fn sys_select(
                 return Ok(res);
             }
 
-            if deadline.map_or(false, |ddl| wall_time() >= ddl) {
+            if deadline.is_some_and(|ddl| wall_time() >= ddl) {
                 debug!("    timeout!");
                 return Ok(0);
             }

api/arceos_posix_api/src/imp/pipe.rs

@@ -5,7 +5,7 @@ use axerrno::{LinuxError, LinuxResult};
 use axio::PollState;
 use axsync::Mutex;
 
-use super::fd_ops::{add_file_like, close_file_like, FileLike};
+use super::fd_ops::{FileLike, add_file_like, close_file_like};
 use crate::ctypes;
 
 #[derive(Copy, Clone, PartialEq)]

api/arceos_posix_api/src/imp/pthread/mutex.rs

@@ -4,7 +4,7 @@ use axerrno::LinuxResult;
 use axsync::Mutex;
 
 use core::ffi::c_int;
-use core::mem::{size_of, ManuallyDrop};
+use core::mem::{ManuallyDrop, size_of};
 
 static_assertions::const_assert_eq!(
     size_of::<ctypes::pthread_mutex_t>(),

api/arceos_posix_api/src/imp/stdio.rs

@@ -1,5 +1,5 @@
 use axerrno::AxResult;
-use axio::{prelude::*, BufReader};
+use axio::{BufReader, prelude::*};
 use axsync::Mutex;
 
 #[cfg(feature = "fd")]

api/arceos_posix_api/src/utils.rs

@@ -2,7 +2,7 @@
 #![allow(unused_macros)]
 
 use axerrno::{LinuxError, LinuxResult};
-use core::ffi::{c_char, CStr};
+use core::ffi::{CStr, c_char};
 
 pub fn char_ptr_to_str<'a>(str: *const c_char) -> LinuxResult<&'a str> {
     if str.is_null() {

api/axfeat/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axfeat"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "Top-level feature selection for ArceOS"
 license.workspace = true

doc/build.md

@@ -41,16 +41,16 @@ What happens when "make A=apps/net/httpserver ARCH=aarch64 LOG=info NET=y SMP=1
     - At runtime, Arceos first performs some boot operations, such as executing in the riscv64 environment:
     ```rust
     #[naked]
-    #[no_mangle]
-    #[link_section = ".text.boot"]
+    #[unsafe(no_mangle)]
+    #[unsafe(link_section = ".text.boot")]
     unsafe extern "C" fn _start() -> ! {
-        extern "C" {
+        unsafe extern "C" {
             fn rust_main();
         }
         // PC = 0x8020_0000
         // a0 = hartid
         // a1 = dtb
-        core::arch::asm!("
+        core::arch::naked_asm!("
             mv      s0, a0                  // save hartid
             mv      s1, a1                  // save DTB pointer
             la      sp, {boot_stack}
@@ -82,7 +82,6 @@ What happens when "make A=apps/net/httpserver ARCH=aarch64 LOG=info NET=y SMP=1
             init_mmu = sym init_mmu,
             platform_init = sym super::platform_init,
             rust_main = sym rust_main,
-            options(noreturn),
         )
     }
     ```