update to 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-05]
     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-05]
     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-05]
     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-05
 
 jobs:
   doc:

.github/workflows/test.yml

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

Cargo.toml

@@ -32,6 +32,7 @@ members = [
 
 [workspace.package]
 version = "0.1.0"
+edition = "2021"
 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"

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

examples/helloworld/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "arceos-helloworld"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

examples/httpclient/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "arceos-httpclient"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>", "Dashuai Wu <[email protected]>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

examples/httpserver/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "arceos-httpserver"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

examples/shell/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "arceos-shell"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

modules/axalloc/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axalloc"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "ArceOS global memory allocator"
 license.workspace = true

modules/axconfig/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axconfig"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "Platform-specific constants and parameters for ArceOS"
 license.workspace = true

modules/axdisplay/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axdisplay"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Shiping Yuan <[email protected]>"]
 description = "ArceOS graphics module"
 license.workspace = true

modules/axdma/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "axdma"
-edition = "2021"
+edition.workspace = true
 version.workspace = true
 authors = ["Zhour Rui <[email protected]>"]
 license.workspace = true

modules/axdriver/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axdriver"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>", "ChengXiang Qi <[email protected]>"]
 description = "ArceOS device drivers"
 license.workspace = true

modules/axfs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axfs"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "ArceOS filesystem module"
 license.workspace = true

modules/axhal/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axhal"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "ArceOS hardware abstraction layer, provides unified APIs for platform-specific operations"
 license.workspace = true

modules/axhal/src/arch/x86_64/context.rs

@@ -1,4 +1,4 @@
-use core::{arch::asm, fmt};
+use core::{arch::naked_asm, fmt};
 use memory_addr::VirtAddr;
 
 /// Saved registers when a trap (interrupt or exception) occurs.
@@ -198,7 +198,7 @@ impl TaskContext {
 
 #[naked]
 unsafe extern "C" fn context_switch(_current_stack: &mut u64, _next_stack: &u64) {
-    asm!(
+    naked_asm!(
         "
         push    rbp
         push    rbx
@@ -216,6 +216,6 @@ unsafe extern "C" fn context_switch(_current_stack: &mut u64, _next_stack: &u64)
         pop     rbx
         pop     rbp
         ret",
-        options(noreturn),
+        // options(noreturn),
     )
 }

modules/axlog/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axlog"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "Macros for multi-level formatted logging used by ArceOS"
 license.workspace = true

modules/axmm/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axmm"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "ArceOS virtual memory management module"
 license.workspace = true

modules/axnet/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axnet"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>", "ChengXiang Qi <[email protected]>"]
 description = "ArceOS network module"
 license.workspace = true

modules/axruntime/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axruntime"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "Runtime library of ArceOS"
 license.workspace = true

modules/axsync/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axsync"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "ArceOS synchronization primitives"
 license.workspace = true

modules/axtask/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axtask"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = ["Yuekai Jia <[email protected]>"]
 description = "ArceOS task management module"
 license.workspace = true

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
 profile = "minimal"
-channel = "nightly-2024-05-02"
+channel = "nightly-2024-12-05"
 components = ["rust-src", "llvm-tools", "rustfmt", "clippy"]
 targets = ["x86_64-unknown-none", "riscv64gc-unknown-none-elf", "aarch64-unknown-none", "aarch64-unknown-none-softfloat"]

tools/bwbench_client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bwbench-client"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 authors = ["ChengXiang Qi <[email protected]>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/deptool/Cargo.toml

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

tools/raspi4/chainloader/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.6.0"
 authors = ["Andre Richter <[email protected]>"]
-edition = "2021"
+edition.workspace = true
 
 [profile.release]
 lto = true

tools/raspi4/chainloader/README.md

@@ -132,7 +132,7 @@ diff -uNr 05_drivers_gpio_uart/Cargo.toml 06_uart_chainloader/Cargo.toml
 -version = "0.5.0"
 +version = "0.6.0"
  authors = ["Andre Richter <[email protected]>"]
- edition = "2021"
+ edition.workspace = true
 
 Binary files 05_drivers_gpio_uart/demo_payload_rpi3.img and 06_uart_chainloader/demo_payload_rpi3.img differ
 Binary files 05_drivers_gpio_uart/demo_payload_rpi4.img and 06_uart_chainloader/demo_payload_rpi4.img differ

ulib/axlibc/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axlibc"
 version.workspace = true
-edition = "2021"
+edition.workspace = true
 authors = [
     "Yuekai Jia <[email protected]>",
     "yanjuguang <[email protected]>",