Update dependencies versions

api/arceos_posix_api/Cargo.toml

@@ -50,4 +50,4 @@ lazy_static = { version = "1.4", features = ["spin_no_std"] }
 flatten_objects = { path = "../../crates/flatten_objects" }
 
 [build-dependencies]
-bindgen ={ version = "0.66" }
+bindgen ={ version = "0.69" }

crates/arm_pl011/Cargo.toml

@@ -10,4 +10,4 @@ repository = "https://github.com/rcore-os/arceos/tree/main/crates/arm_pl011"
 documentation = "https://rcore-os.github.io/arceos/arm_pl011/index.html"
 
 [dependencies]
-tock-registers = "0.8"
+tock-registers = "0.8"

crates/axfs_vfs/Cargo.toml

@@ -14,5 +14,5 @@ default = []
 
 [dependencies]
 log = "0.4"
-bitflags = "2.2"
+bitflags = "2.5"
 axerrno = { path = "../axerrno" }

crates/capability/Cargo.toml

@@ -10,5 +10,5 @@ repository = "https://github.com/rcore-os/arceos/tree/main/crates/capability"
 documentation = "https://rcore-os.github.io/arceos/capability/index.html"
 
 [dependencies]
-bitflags = "2.2"
+bitflags = "2.5"
 axerrno = { path = "../axerrno" }

crates/driver_pci/Cargo.toml

@@ -10,4 +10,4 @@ repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_pci"
 documentation = "https://rcore-os.github.io/arceos/driver_pci/index.html"
 
 [dependencies]
-virtio-drivers = "0.7.2"
+virtio-drivers = "0.7.3"

crates/driver_virtio/Cargo.toml

@@ -19,4 +19,4 @@ driver_common = { path = "../driver_common" }
 driver_block = { path = "../driver_block", optional = true }
 driver_net = { path = "../driver_net", optional = true }
 driver_display = { path = "../driver_display", optional = true}
-virtio-drivers = "0.7.2"
+virtio-drivers = "0.7.3"

crates/page_table_entry/Cargo.toml

@@ -10,9 +10,9 @@ repository = "https://github.com/rcore-os/arceos/tree/main/crates/page_table_ent
 documentation = "https://rcore-os.github.io/arceos/page_table_entry/index.html"
 
 [dependencies]
-bitflags = "2.2"
+bitflags = "2.5"
 memory_addr = { path = "../memory_addr" }
-aarch64-cpu = "9.3" # TODO: put it in [target.'cfg(target_arch = "aarch64")'.dependencies]
+aarch64-cpu = "9.4" # TODO: put it in [target.'cfg(target_arch = "aarch64")'.dependencies]
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
-x86_64 = "0.14"
+x86_64 = "0.15"

modules/axconfig/Cargo.toml

@@ -10,5 +10,5 @@ repository = "https://github.com/rcore-os/arceos/tree/main/modules/axconfig"
 documentation = "https://rcore-os.github.io/arceos/axconfig/index.html"
 
 [build-dependencies]
-toml_edit = "0.19"
+toml_edit = "0.22"
 serde = "1.0"

modules/axconfig/build.rs

@@ -1,6 +1,6 @@
 use std::io::{Result, Write};
 use std::path::{Path, PathBuf};
-use toml_edit::{Decor, Document, Item, Table, Value};
+use toml_edit::{Decor, DocumentMut, Item, Table, Value};
 
 fn resolve_config_path(platform: Option<&str>) -> Result<PathBuf> {
     let mut root_dir = PathBuf::from(std::env!("CARGO_MANIFEST_DIR"));
@@ -37,25 +37,25 @@ fn resolve_config_path(platform: Option<&str>) -> Result<PathBuf> {
 
 fn get_comments<'a>(config: &'a Table, key: &str) -> Option<&'a str> {
     config
-        .key_decor(key)
-        .and_then(|d| d.prefix())
+        .key(key)
+        .and_then(|k| k.leaf_decor().prefix())
         .and_then(|s| s.as_str())
         .map(|s| s.trim())
 }
 
 fn add_config(config: &mut Table, key: &str, item: Item, comments: Option<&str>) {
     config.insert(key, item);
     if let Some(comm) = comments {
-        if let Some(dst) = config.key_decor_mut(key) {
-            *dst = Decor::new(comm, "");
+        if let Some(mut dst) = config.key_mut(key) {
+            *dst.leaf_decor_mut() = Decor::new(comm, "");
         }
     }
 }
 
 fn load_config_toml(config_path: &Path) -> Result<Table> {
     let config_content = std::fs::read_to_string(config_path)?;
     let toml = config_content
-        .parse::<Document>()
+        .parse::<DocumentMut>()
         .expect("failed to parse config file")
         .as_table()
         .clone();

modules/axdriver/src/drivers.rs

@@ -13,6 +13,7 @@ use driver_pci::{DeviceFunction, DeviceFunctionInfo, PciRoot};
 
 pub use super::dummy::*;
 
+#[allow(dead_code)]
 pub trait DriverProbe {
     fn probe_global() -> Option<AxDeviceEnum> {
         None

modules/axdriver/src/lib.rs

@@ -16,15 +16,15 @@
 //! This crate supports two device models depending on the `dyn` feature:
 //!
 //! - **Static**: The type of all devices is static, it is determined at compile
-//!  time by corresponding cargo features. For example, [`AxNetDevice`] will be
-//! an alias of [`VirtioNetDev`] if the `virtio-net` feature is enabled. This
-//! model provides the best performance as it avoids dynamic dispatch. But on
-//! limitation, only one device instance is supported for each device category.
+//!   time by corresponding cargo features. For example, [`AxNetDevice`] will be
+//!   an alias of [`VirtioNetDev`] if the `virtio-net` feature is enabled. This
+//!   model provides the best performance as it avoids dynamic dispatch. But on
+//!   limitation, only one device instance is supported for each device category.
 //! - **Dynamic**: All device instance is using [trait objects] and wrapped in a
-//! `Box<dyn Trait>`. For example, [`AxNetDevice`] will be [`Box<dyn NetDriverOps>`].
-//! When call a method provided by the device, it uses [dynamic dispatch][dyn]
-//! that may introduce a little overhead. But on the other hand, it is more
-//! flexible, multiple instances of each device category are supported.
+//!   `Box<dyn Trait>`. For example, [`AxNetDevice`] will be [`Box<dyn NetDriverOps>`].
+//!   When call a method provided by the device, it uses [dynamic dispatch][dyn]
+//!   that may introduce a little overhead. But on the other hand, it is more
+//!   flexible, multiple instances of each device category are supported.
 //!
 //! # Supported Devices
 //!

modules/axfs/Cargo.toml

@@ -37,7 +37,7 @@ crate_interface = { path = "../../crates/crate_interface", optional = true }
 
 [dependencies.fatfs]
 git = "https://github.com/rafalh/rust-fatfs"
-rev = "a3a834e"
+rev = "85f06e0"
 optional = true
 default-features = false
 features = [ # no std

modules/axhal/Cargo.toml

@@ -21,7 +21,7 @@ default = []
 [dependencies]
 log = "0.4"
 cfg-if = "1.0"
-bitflags = "2.2"
+bitflags = "2.5"
 static_assertions = "1.1.0"
 axlog = { path = "../axlog" }
 axconfig = { path = "../axconfig" }
@@ -39,16 +39,16 @@ crate_interface = { path = "../../crates/crate_interface" }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 x86 = "0.52"
-x86_64 = "0.14"
+x86_64 = "0.15"
 x2apic = "0.4"
 raw-cpuid = "11.0"
 
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
-riscv = "0.10"
-sbi-rt = { version = "0.0.2", features = ["legacy"] }
+riscv = "0.11"
+sbi-rt = { version = "0.0.3", features = ["legacy"] }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-aarch64-cpu = "9.3"
+aarch64-cpu = "9.4"
 tock-registers = "0.8"
 arm_gic = { path = "../../crates/arm_gic" }
 arm_pl011 = { path = "../../crates/arm_pl011" }

modules/axhal/src/arch/riscv/mod.rs

@@ -33,14 +33,14 @@ pub fn irqs_enabled() -> bool {
 /// It must be called with interrupts enabled, otherwise it will never return.
 #[inline]
 pub fn wait_for_irqs() {
-    unsafe { riscv::asm::wfi() }
+    riscv::asm::wfi()
 }
 
 /// Halt the current CPU.
 #[inline]
 pub fn halt() {
     disable_irqs();
-    unsafe { riscv::asm::wfi() } // should never return
+    riscv::asm::wfi() // should never return
 }
 
 /// Reads the register that stores the current page table root.

modules/axhal/src/platform/aarch64_raspi/mp.rs

@@ -42,7 +42,7 @@ pub fn start_secondary_cpu(cpu_id: usize, stack_top: PhysAddr) {
         // set the boot stack of the given secondary CPU
         SECONDARY_STACK_TOP = stack_top.as_usize();
         crate::arch::flush_dcache_line(VirtAddr::from(
-            (&SECONDARY_STACK_TOP as *const usize) as usize,
+            core::ptr::addr_of!(SECONDARY_STACK_TOP) as usize
         ));
     }
     aarch64_cpu::asm::sev();

ulib/axlibc/Cargo.toml

@@ -57,4 +57,4 @@ axio = { path = "../../crates/axio" }
 axerrno = { path = "../../crates/axerrno" }
 
 [build-dependencies]
-bindgen ={ version = "0.66" }
+bindgen ={ version = "0.69" }