feat: update to Rust 1.96

.github/actions/setup-mkosi-environment/action.yml

@@ -4,7 +4,7 @@ inputs:
   rust-version:
     description: 'Rust toolchain version to install'
     required: false
-    default: '1.90.0'
+    default: '1.96.0'
   arch:
     description: 'Target architecture (x86_64 or aarch64)'
     required: false

.github/workflows/build-boot-artifacts.yml

@@ -140,7 +140,7 @@ jobs:
         if: inputs.build_type == 'ephemeral'
         uses: ./.github/actions/setup-mkosi-environment
         with:
-          rust-version: '1.90.0'
+          rust-version: '1.96.0'
           arch: ${{ inputs.arch }}
 
       # Setup Docker for container-based builds

Makefile.toml

@@ -46,7 +46,7 @@ BUILD_CONTAINER_AARCH64_URL = { value = "urm.nvidia.com/swngc-ngcc-docker-local/
 #
 # Make sure to update the RUST_NIGHTLY variable in
 # dev/docker/Dockerfile.build-container-x86_64 if you change this.
-RUST_NIGHTLY = "nightly-2026-05-27"
+RUST_NIGHTLY = "nightly-2026-06-16"
 
 [tasks.book]
 workspace = false

crates/bmc-proxy/src/setup.rs

@@ -89,7 +89,6 @@ pub fn dep_log_filter(env_filter: EnvFilter) -> EnvFilter {
 #[cfg(test)]
 mod tests {
     use carbide_test_support::value_scenarios;
-    use tracing_subscriber::prelude::*;
 
     use super::*;
 

dev/docker/Dockerfile.build-artifacts-container-aarch64

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM arm64v8/rust:1.95.0-slim-bullseye
+FROM arm64v8/rust:1.96.0-slim-bullseye
 
 # Set in gitlab-templates/scripts/build-push-container-image.sh
 ARG CI_COMMIT_SHORT_SHA

dev/docker/Dockerfile.build-artifacts-container-cross-aarch64

@@ -16,7 +16,7 @@
 # Note that the output container image needs to be able to produce artifacts
 # that are compatible with the DPU BFB, so for example the libc6 version can't
 # be greater than what we see in the BFB.
-FROM rust:1.95.0-bookworm
+FROM rust:1.96.0-bookworm
 
 RUN dpkg --add-architecture arm64 && \
     apt-get update && \

dev/docker/Dockerfile.build-artifacts-container-x86_64

@@ -26,7 +26,7 @@
 # - `docker push urm.nvidia.com/swngc-ngcc-docker-local/forge/carbide/x86-64/build-container:{OUTPUT_OF_GIT_DESCRIBE_HERE}`
 
 # This should match rust-toolchain.toml
-FROM rust:1.95.0-slim-bullseye
+FROM rust:1.96.0-slim-bullseye
 
 # Set in gitlab-templates/scripts/build-push-container-image.sh
 ARG CI_COMMIT_SHORT_SHA

dev/docker/Dockerfile.build-container-aarch64

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM arm64v8/rust:1.95.0-slim-bookworm
+FROM arm64v8/rust:1.96.0-slim-bookworm
 
 # Set in gitlab-templates/scripts/build-push-container-image.sh
 ARG CI_COMMIT_SHORT_SHA

dev/docker/Dockerfile.build-container-x86_64

@@ -16,12 +16,12 @@
 #
 
 # This should match rust-toolchain.toml
-FROM rust:1.95.0-slim-bookworm
+FROM rust:1.96.0-slim-bookworm
 
 # Set in gitlab-templates/scripts/build-push-container-image.sh
 ARG CI_COMMIT_SHORT_SHA
 ENV CI_COMMIT_SHORT_SHA $CI_COMMIT_SHORT_SHA
-ENV RUST_NIGHTLY nightly-2026-05-27
+ENV RUST_NIGHTLY nightly-2026-06-16
 
 # Change CACHEKEY to whatever so docker doesn't re-use the cache from before if you want apt to actually run.
 #

dev/docker/Dockerfile.cargo-docker-minimal

@@ -9,7 +9,7 @@
 # On Apple Silicon (M1/M2/M3): do not set --platform=linux/amd64. Building on
 # arm64 produces a native image; use Colima with enough CPU/memory and virtiofs (see docs).
 #
-FROM rust:1.95.0-slim-bookworm
+FROM rust:1.96.0-slim-bookworm
 
 RUN apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

docs/manuals/cargo-via-docker-macos.md

@@ -8,13 +8,13 @@ This guide describes what is in place for running Cargo (build, test, check) via
 
 | Item | Location | Purpose |
 |------|----------|--------|
-| **Makefile task: `cargo-docker-minimal`** | `Makefile.toml` | Run Cargo in the minimal image (`nico-build-minimal`: Rust 1.95 + protoc). **Recommended on Mac.** Requires `build-cargo-docker-image-minimal` once. |
+| **Makefile task: `cargo-docker-minimal`** | `Makefile.toml` | Run Cargo in the minimal image (`nico-build-minimal`: Rust 1.96 + protoc). **Recommended on Mac.** Requires `build-cargo-docker-image-minimal` once. |
 | **Makefile task: `build-cargo-docker-image-minimal`** | `Makefile.toml` | Build the minimal image (Rust + protoc only). Quick (~2–5 min). Required once for workspace builds (e.g. `nico-rpc` needs `protoc`). |
 | **Makefile task: `cargo-docker`** | `Makefile.toml` | Run Cargo inside the repo’s full build container (`nico-build-x86_64`). Requires building that image first. |
 | **Makefile task: `build-cargo-docker-image`** | `Makefile.toml` | Build the full Linux build image from `dev/docker/Dockerfile.build-container-x86_64`. Slow on Apple Silicon (45+ min). |
 | **This guide** | `docs/development/cargo-via-docker-macos.md` | How to use the above and when to choose which option. |
-| **Minimal Dockerfile** | `dev/docker/Dockerfile.cargo-docker-minimal` | Rust 1.95 + `protobuf-compiler` + `libprotobuf-dev` (well-known types). Used for `nico-build-minimal`. |
-| **Full build Dockerfile** | `dev/docker/Dockerfile.build-container-x86_64` | Defines the full build image (Rust 1.95, PostgreSQL, protobuf, TSS, etc.). |
+| **Minimal Dockerfile** | `dev/docker/Dockerfile.cargo-docker-minimal` | Rust 1.96 + `protobuf-compiler` + `libprotobuf-dev` (well-known types). Used for `nico-build-minimal`. |
+| **Full build Dockerfile** | `dev/docker/Dockerfile.build-container-x86_64` | Defines the full build image (Rust 1.96, PostgreSQL, protobuf, TSS, etc.). |
 
 All commands below are run from the **repository root** unless noted.
 
@@ -173,7 +173,7 @@ If you get an error about the `loki` logging plugin, use: `docker-compose -f doc
 
 **2. Run IB partition tests:**
 
-**Locally (Rust 1.95 + `DATABASE_URL`):**
+**Locally (Rust 1.96 + `DATABASE_URL`):**
 
 ```bash
 export DATABASE_URL="postgres://nico_development:notforprod@localhost:5432/nico_development"
@@ -248,7 +248,7 @@ Output binaries appear under `target/` in your repo as usual.
 
 **When to use:** Day-to-day builds and checks on macOS when you don’t need the full API test stack (PostgreSQL, TSS, etc.).
 
-**What it uses:** The image `nico-build-minimal` (Rust 1.95 + `protoc`). You must build it once with `build-cargo-docker-image-minimal` (~2–5 min). The `nico-rpc` crate needs `protoc` and the Google well-known proto files (`libprotobuf-dev`), so the bare `rust:1.95.0-slim-bookworm` image is not enough for workspace builds.
+**What it uses:** The image `nico-build-minimal` (Rust 1.96 + `protoc`). You must build it once with `build-cargo-docker-image-minimal` (~2–5 min). The `nico-rpc` crate needs `protoc` and the Google well-known proto files (`libprotobuf-dev`), so the bare `rust:1.96.0-slim-bookworm` image is not enough for workspace builds.
 
 ### Usage
 

lints/carbide-lints/rust-toolchain.toml

@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 [toolchain]
-channel = "nightly-2026-05-27"
+channel = "nightly-2026-06-16"

rust-toolchain.toml

@@ -15,5 +15,5 @@
 # limitations under the License.
 #
 [toolchain]
-# If you change this grep for "FROM.*rust:1.95.0" and update those Dockerfiles
-channel = "1.95.0"
+# If you change this grep for "FROM.*rust:1.96.0" and update those Dockerfiles
+channel = "1.96.0"