Bump Rust toolchain and crate dependencies

Cargo.nix

@@ -24,9 +24,13 @@
     members = lib.naturalSort (lib.mapAttrsToList (_: v: v.path) localCrates);
   };
   patch.crates-io = {
-    ring = localCrates.ring or  {
+    ring = localCrates.ring or {
       git = "https://github.com/coliasgroup/ring.git";
       rev = "0f749acc5d5a8310dfc3ff985df04056f497fc1b"; # branch sel4
     };
+    hashbrown = {
+      git = "https://github.com/coliasgroup/hashbrown.git";
+      rev = "c284cda40a72b0e9ddb1f9a8ea490d4f73473483"; # branch sel4
+    };
   };
 }

Cargo.toml

@@ -167,6 +167,10 @@ members = [
 ]
 default-members = []
 
+[patch.crates-io.hashbrown]
+git = "https://github.com/coliasgroup/hashbrown.git"
+rev = "c284cda40a72b0e9ddb1f9a8ea490d4f73473483"
+
 [patch.crates-io.ring]
 git = "https://github.com/coliasgroup/ring.git"
 rev = "0f749acc5d5a8310dfc3ff985df04056f497fc1b"

crates/drivers/virtio/net/Cargo.toml

@@ -22,6 +22,6 @@ sel4-driver-interfaces = { path = "../../../experimental/sel4-driver-interfaces"
 virtio-drivers = { version = "0.13.0", default-features = false, features = ["alloc"] }
 
 [dependencies.smoltcp]
-version = "0.13.0"
+version = "0.14.0"
 default-features = false
 features = ["proto-ipv4", "proto-dhcpv4", "proto-dns", "socket-dhcpv4", "socket-dns", "socket-tcp"]

crates/examples/microkit/http-server/pds/server/Cargo.toml

@@ -59,7 +59,7 @@ path = "../../../../../experimental/sel4-shared-ring-buffer/bookkeeping"
 path = "../../../../../experimental/sel4-shared-ring-buffer/smoltcp"
 
 [dependencies.smoltcp]
-version = "0.13.0"
+version = "0.14.0"
 default-features = false
 features = [
     "proto-ipv4",

crates/examples/microkit/http-server/pds/server/core/Cargo.toml

@@ -40,6 +40,6 @@ path = "../../../../../../experimental/sel4-async/network/rustls/utils"
 path = "../../../../../../experimental/sel4-async/single-threaded-executor"
 
 [dependencies.smoltcp]
-version = "0.13.0"
+version = "0.14.0"
 default-features = false
 features = ["proto-ipv4", "proto-dhcpv4", "proto-dns", "socket-dhcpv4", "socket-dns", "socket-tcp"]

crates/examples/root-task/spawn-task/Cargo.toml

@@ -17,6 +17,6 @@ edition = "2024"
 license = "BSD-2-Clause"
 
 [dependencies]
-object = { version = "0.38.1", default-features = false, features = ["read"] }
+object = { version = "0.40.0", default-features = false, features = ["read"] }
 sel4 = { path = "../../../sel4" }
 sel4-root-task = { path = "../../../sel4-root-task" }

crates/examples/root-task/spawn-task/src/child_vspace.rs

@@ -172,14 +172,14 @@ fn map_image<'a>(
 
 fn add_rights(rights: &mut sel4::CapRightsBuilder, flags: SegmentFlags) {
     match flags {
-        SegmentFlags::Elf { p_flags } => {
-            if p_flags & PF_R != 0 {
+        SegmentFlags::Elf { p_flags, .. } => {
+            if p_flags.contains(PF_R) {
                 *rights = rights.read(true);
             }
-            if p_flags & PF_W != 0 {
+            if p_flags.contains(PF_W) {
                 *rights = rights.write(true);
             }
-            if p_flags & PF_X != 0 {
+            if p_flags.contains(PF_X) {
                 *rights = rights.grant(true);
             }
         }

crates/experimental/sel4-async/block-io/Cargo.toml

@@ -25,5 +25,5 @@ bytemuck = { version = "1.24.0", default-features = false }
 futures = { version = "0.3.31", default-features = false }
 gpt_disk_types = { version = "0.16.1", features = ["bytemuck"] }
 log = "0.4.28"
-lru = { version = "0.16.2", optional = true }
+lru = { version = "0.18.2", optional = true }
 num_enum = { version = "0.7.5", default-features = false }

crates/experimental/sel4-async/block-io/fat/Cargo.toml

@@ -21,7 +21,7 @@ futures = { version = "0.3.31", default-features = false, features = ["alloc"] }
 heapless = "0.9.1"
 hex = { version = "0.4.3", default-features = false }
 log = "0.4.28"
-lru = "0.16.2"
+lru = "0.18.2"
 sel4-async-block-io = { path = ".." }
 
 [dependencies.embedded-fat]

crates/experimental/sel4-async/network/Cargo.toml

@@ -22,7 +22,7 @@ sel4-async-io = { path = "../io" }
 thiserror = { version = "2.0.17", default-features = false }
 
 [dependencies.smoltcp]
-version = "0.13.0"
+version = "0.14.0"
 default-features = false
 features = [
     "proto-ipv4",

crates/experimental/sel4-backtrace/addr2line-context-helper/Cargo.toml

@@ -17,12 +17,12 @@ edition = "2024"
 license = "BSD-2-Clause"
 
 [dependencies]
-gimli = { version = "0.33.0", default-features = false, features = ["endian-reader"] }
-object = { version = "0.38.1", default-features = false, features = ["read"] }
+gimli = { version = "0.34.0", default-features = false, features = ["endian-reader"] }
+object = { version = "0.40.0", default-features = false, features = ["read"] }
 stable_deref_trait = { version = "1.2.1", default-features = false, features = ["alloc"] }
 thiserror = { version = "2.0.17", default-features = false }
 
 [dependencies.addr2line]
-version = "0.26.0"
+version = "0.27.1"
 default-features = false
 features = ["rustc-demangle", "cpp_demangle", "fallible-iterator", "smallvec"]

crates/experimental/sel4-backtrace/cli/Cargo.toml

@@ -19,6 +19,6 @@ license = "BSD-2-Clause"
 [dependencies]
 clap = { version = "4.5.50", features = ["derive"] }
 hex = "0.4.3"
-object = "0.38.1"
+object = "0.40.0"
 sel4-backtrace-addr2line-context-helper = { path = "../addr2line-context-helper" }
 sel4-backtrace-types = { path = "../types", features = ["full"] }

crates/experimental/sel4-backtrace/embedded-debug-info/Cargo.toml

@@ -17,8 +17,8 @@ edition = "2024"
 license = "BSD-2-Clause"
 
 [dependencies]
-addr2line = { version = "0.26.0", default-features = false }
-object = { version = "0.38.1", default-features = false, features = ["read"] }
+addr2line = { version = "0.27.1", default-features = false }
+object = { version = "0.40.0", default-features = false, features = ["read"] }
 sel4-backtrace-addr2line-context-helper = { path = "../addr2line-context-helper" }
 sel4-phdrs = { path = "../../../sel4-phdrs" }
 sel4-phdrs-patched = { path = "../../../sel4-phdrs/patched" }

crates/experimental/sel4-backtrace/embedded-debug-info/cli/Cargo.toml

@@ -18,6 +18,6 @@ license = "BSD-2-Clause"
 
 [dependencies]
 clap = { version = "4.5.50", features = ["derive"] }
-object = "0.38.1"
+object = "0.40.0"
 sel4-patch-elf = { path = "../../../../sel4-patch-elf" }
 sel4-phdrs-constants = { path = "../../../../sel4-phdrs/constants" }

crates/experimental/sel4-backtrace/embedded-debug-info/cli/src/bin/sel4-embed-debug-info.rs

@@ -8,6 +8,7 @@ use std::fs;
 use std::io;
 
 use clap::Parser;
+use object::elf::ProgramType;
 use object::read::elf::ElfFile;
 
 use sel4_patch_elf::{FileHeaderExt, Patching};
@@ -42,6 +43,6 @@ fn main() -> Result<(), io::Error> {
 
 fn with_bit_width<T: FileHeaderExt>(image_elf: &ElfFile<T>, content: &[u8]) -> Vec<u8> {
     let mut patching = Patching::new(image_elf);
-    patching.add_data_segment_with_meta_phdr(PT_SEL4_EMBEDDED_DEBUG_INFO, 1, content);
+    patching.add_data_segment_with_meta_phdr(ProgramType(PT_SEL4_EMBEDDED_DEBUG_INFO), 1, content);
     patching.finalize()
 }

crates/experimental/sel4-backtrace/symbolize/Cargo.toml

@@ -17,6 +17,6 @@ edition = "2024"
 license = "MIT OR Apache-2.0"
 
 [dependencies.addr2line]
-version = "0.26.0"
+version = "0.27.1"
 default-features = false
 features = ["rustc-demangle", "cpp_demangle", "fallible-iterator", "smallvec"]

crates/experimental/sel4-backtrace/types/Cargo.toml

@@ -30,7 +30,7 @@ sel4-backtrace-symbolize = { path = "../symbolize", optional = true }
 serde = { version = "1.0.228", default-features = false, features = ["derive"], optional = true }
 
 [dependencies.addr2line]
-version = "0.26.0"
+version = "0.27.1"
 default-features = false
 features = ["rustc-demangle", "cpp_demangle", "fallible-iterator", "smallvec"]
 optional = true

crates/experimental/sel4-linux-syscall-types/src/lib.rs

@@ -7,7 +7,6 @@
 // TODO use https://github.com/mebeim/linux-syscalls/tree/master/db
 
 #![no_std]
-#![feature(c_variadic)]
 
 use core::ffi::{c_char, c_int, c_void};
 

crates/experimental/sel4-linux-syscall-types/src/syscall_registers.rs

@@ -93,6 +93,6 @@ impl<'a> VaListAsSyscallArgs<'a> {
 
 impl SyscallArgs for VaListAsSyscallArgs<'_> {
     fn next_word_arg(&mut self) -> Option<SyscallWordArg> {
-        Some(unsafe { self.0.arg() })
+        Some(unsafe { self.0.next_arg() })
     }
 }

crates/experimental/sel4-microkit/driver-adapters/Cargo.toml

@@ -31,6 +31,6 @@ sel4-shared-ring-buffer = { path = "../../sel4-shared-ring-buffer" }
 serde = { version = "1.0.228", default-features = false }
 
 [dependencies.smoltcp]
-version = "0.13.0"
+version = "0.14.0"
 default-features = false
 features = ["proto-ipv4", "proto-dhcpv4", "proto-dns", "socket-dhcpv4", "socket-dns", "socket-tcp"]

crates/experimental/sel4-musl/src/lib.rs

@@ -5,7 +5,6 @@
 //
 
 #![no_std]
-#![feature(c_variadic)]
 
 use core::ffi::{CStr, c_char};
 

crates/experimental/sel4-shared-ring-buffer/smoltcp/Cargo.toml

@@ -27,6 +27,6 @@ sel4-shared-ring-buffer = { path = ".." }
 sel4-shared-ring-buffer-bookkeeping = { path = "../bookkeeping" }
 
 [dependencies.smoltcp]
-version = "0.13.0"
+version = "0.14.0"
 default-features = false
 features = ["proto-ipv4", "proto-dhcpv4", "proto-dns", "socket-dhcpv4", "socket-dns", "socket-tcp"]

crates/private/support/sel4-minimal-linux-runtime/macros/Cargo.toml

@@ -22,4 +22,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.103"
 quote = "1.0.41"
-syn = { version = "2.0.108", features = ["full"] }
+syn = { version = "3.0.4", features = ["full"] }

crates/private/support/sel4-simple-task/runtime/macros/Cargo.toml

@@ -22,4 +22,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.103"
 quote = "1.0.41"
-syn = { version = "2.0.108", features = ["full"] }
+syn = { version = "3.0.4", features = ["full"] }

crates/private/support/sel4-test-runner/Cargo.toml

@@ -19,6 +19,6 @@ license = "BSD-2-Clause"
 [dependencies]
 anyhow = "1.0.100"
 clap = { version = "4.5.50", features = ["derive"] }
-object = "0.38.1"
+object = "0.40.0"
 sel4-test-sentinels-wrapper = { path = "../sel4-test-sentinels/wrapper" }
 tempfile = "3.27.0"

crates/private/tests/root-task/verus/core/Cargo.toml

@@ -20,6 +20,6 @@ license = "BSD-2-Clause"
 verify = true
 
 [dependencies]
-verus_builtin = "=0.0.0-2026-03-17-2326"
-verus_builtin_macros = "=0.0.0-2026-03-17-2326"
-vstd = { version = "=0.0.0-2026-03-17-2326", default-features = false }
+verus_builtin = "=0.0.0-2026-08-09-0044"
+verus_builtin_macros = "=0.0.0-2026-08-23-0033"
+vstd = { version = "=0.0.0-2026-08-23-0033", default-features = false }

crates/sel4-capdl-initializer/add-spec/Cargo.toml

@@ -20,7 +20,7 @@ license = "BSD-2-Clause"
 anyhow = "1.0.100"
 clap = { version = "4.5.50", features = ["derive"] }
 num = "0.4.3"
-object = "0.38.1"
+object = "0.40.0"
 rkyv = "0.8.12"
 sel4-capdl-initializer-types = { path = "../types", features = ["serde", "deflate", "transform"] }
 sel4-patch-elf = { path = "../../sel4-patch-elf" }

crates/sel4-capdl-initializer/add-spec/src/lib.rs

@@ -6,6 +6,7 @@
 
 use std::path::Path;
 
+use object::elf::ProgramType;
 use rkyv::util::AlignedVec;
 
 use sel4_capdl_initializer_types::InputSpec;
@@ -50,13 +51,13 @@ pub fn add_spec(
     let mut patching = Patching::new(&parsed);
 
     patching.add_data_segment_with_meta_phdr(
-        PT_SEL4_CAPDL_FRAME_DATA,
+        ProgramType(PT_SEL4_CAPDL_FRAME_DATA),
         1 << GRANULE_SIZE_BITS,
         &embedded_frame_data,
     );
 
     patching.add_data_segment_with_meta_phdr(
-        PT_SEL4_CAPDL_SPEC,
+        ProgramType(PT_SEL4_CAPDL_SPEC),
         ArchiveAlignedVec::ALIGNMENT.try_into().unwrap(),
         &spec_data,
     );

crates/sel4-capdl-initializer/types/derive/Cargo.toml

@@ -22,4 +22,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.103"
 quote = "1.0.41"
-syn = "2.0.108"
+syn = "3.0.4"

crates/sel4-dlmalloc/src/lib.rs

@@ -150,7 +150,7 @@ impl SimpleDlmallocAllocator for StaticDlmallocAllocator {
     fn alloc_simple(&self, size: usize) -> Option<*mut u8> {
         let old_watermark = self
             .watermark
-            .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |old_watermark| {
+            .try_update(Ordering::SeqCst, Ordering::SeqCst, |old_watermark| {
                 let new_watermark = old_watermark.checked_add(size)?;
                 if new_watermark > self.bounds.size() {
                     return None;

crates/sel4-kernel-loader/Cargo.toml

@@ -30,22 +30,22 @@ sel4-phdrs = { path = "../sel4-phdrs" }
 sel4-phdrs-patched = { path = "../sel4-phdrs/patched" }
 sel4-platform-info = { path = "../sel4-platform-info" }
 sel4-stack = { path = "../sel4-stack" }
-spin = { version = "0.10.0", features = ["lock_api"] }
+spin = { version = "0.12.3", features = ["lock_api"] }
 
 [build-dependencies]
 cc = "1.2.43"
 glob = "0.3.3"
-object = "0.38.1"
+object = "0.40.0"
 postcard = { version = "1.1.3", default-features = false, features = ["alloc"] }
-prettyplease = "0.2.37"
+prettyplease = "0.3.0"
 proc-macro2 = "1.0.103"
 quote = "1.0.41"
 sel4-build-env = { path = "../sel4/build-env" }
 sel4-config = { path = "../sel4/config" }
 sel4-kernel-loader-payload-types = { path = "payload-types" }
 sel4-platform-info = { path = "../sel4-platform-info" }
 serde = "1.0.228"
-syn = { version = "2.0.108", features = ["parsing"] }
+syn = { version = "3.0.4", features = ["parsing"] }
 
 [target."cfg(any(target_arch = \"arm\", target_arch = \"aarch64\"))".dependencies]
 sel4-bcm2835-aux-uart-driver = { path = "../drivers/bcm2835-aux-uart" }

crates/sel4-kernel-loader/add-payload/Cargo.toml

@@ -21,7 +21,7 @@ anyhow = "1.0.100"
 bitfield = "0.19.3"
 clap = { version = "4.5.50", features = ["derive"] }
 num = "0.4.3"
-object = "0.38.1"
+object = "0.40.0"
 rkyv = "0.8.12"
 sel4-config-types = { path = "../../sel4/config/types", features = ["serde"] }
 sel4-kernel-loader-payload-types = { path = "../payload-types" }

crates/sel4-kernel-loader/add-payload/src/main.rs

@@ -8,7 +8,7 @@ use std::fs::{self, File};
 
 use anyhow::Result;
 use clap::Parser;
-use object::elf::{FileHeader32, FileHeader64};
+use object::elf::{FileHeader32, FileHeader64, ProgramType};
 use object::read::elf::{ElfFile, FileHeader, ProgramHeader};
 use object::{Endianness, ReadRef};
 use rkyv::util::AlignedVec;
@@ -191,7 +191,7 @@ where
     }
 
     patching.add_data_segment_with_meta_phdr(
-        PT_SEL4_KERNEL_LOADER_PAYLOAD,
+        ProgramType(PT_SEL4_KERNEL_LOADER_PAYLOAD),
         ArchiveAlignedVec::ALIGNMENT.try_into().unwrap(),
         &payload_data,
     );

crates/sel4-microkit/macros/Cargo.toml

@@ -22,4 +22,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.103"
 quote = "1.0.41"
-syn = { version = "2.0.108", features = ["full"] }
+syn = { version = "3.0.4", features = ["full"] }

crates/sel4-patch-elf/Cargo.toml

@@ -17,4 +17,4 @@ edition = "2024"
 license = "BSD-2-Clause"
 
 [dependencies]
-object = "0.38.1"
+object = "0.40.0"

crates/sel4-patch-elf/src/dynamic.rs

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 //
 
-use object::elf::{FileHeader32, FileHeader64};
+use object::elf::{FileHeader32, FileHeader64, ProgramType};
 use object::{Endianness, File};
 
 use super as low_level;
@@ -44,7 +44,12 @@ impl<'a> Patching<'a> {
         }
     }
 
-    pub fn add_data_segment_with_meta_phdr(&mut self, p_type: u32, data_align: u64, data: &[u8]) {
+    pub fn add_data_segment_with_meta_phdr(
+        &mut self,
+        p_type: ProgramType,
+        data_align: u64,
+        data: &[u8],
+    ) {
         match self {
             Self::Patching32(this) => {
                 this.add_data_segment_with_meta_phdr(p_type, data_align, data)