From b8f4bf4056567fbb91a8739ea7b907e2101edb84 Mon Sep 17 00:00:00 2001 From: Debin Date: Sat, 11 Jul 2026 14:06:40 +0000 Subject: [PATCH] build: pin x86_64 workspace dependency to 0.15.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit x86_64 0.15.5's `nightly` feature now includes `step_trait`, whose `Step` impl uses `forward_overflowing`/`backward_overflowing` — methods added to `core::iter::Step` only around nightly-2026-07-10, absent from our pinned rustc 1.95.0. The `x2apic` crate (used by drivers/timer and drivers/x86-apic) enables x86_64's `default` -> `nightly` -> `step_trait`, so disabling default-features on the workspace dep cannot prevent it (cargo feature unification re-enables it). 0.15.4's `nightly` does not include `step_trait`, so the impl stays uncompiled and the x86_64 build succeeds. Bump to >=0.15.5 only after upgrading the toolchain to nightly-2026-07-10 or later. --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 27cb2ee89..ca424bdef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -225,7 +225,8 @@ smoltcp = { version = "=0.13.0", default-features = false } smccc = "0.2.3" strum = { version = "0.27", default-features = false, features = ["derive"] } virtio-drivers = { version = "0.13.1", default-features = false, package = "kvirtiodrivers" } -x86_64 = { version = "0.15.2", features = ["instructions"] } +# Pinned: 0.15.5's `nightly`->`step_trait` (pulled in by `x2apic`) needs Step methods absent from rustc 1.95.0; bump after nightly-2026-07-10+. +x86_64 = { version = "=0.15.4", features = ["instructions"] } ktracepoint = "0.5" static-keys = "0.8" downcast-rs = { version = "2.0", default-features = false, features = ["sync"] } -- Gitee