Repository navigation
Changes to allow different toolchains for host and guest - #1962
Open
simongdavies wants to merge 5 commits into
Open
simongdavies wants to merge 5 commits into
simongdavies wants to merge 5 commits into
Conversation
Host move to 1.99.1 Guest fixed at 1.94.1 until hyperlight target is upstreamed Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
simongdavies
added
the
kind/dependencies
simongdavies
requested review from
andreiltd,
danbugs,
dblnz,
devigned,
jprendes,
jsturtevant,
ludfjig,
squillace and
syntactically
as code owners
October 20, 2026 15:46
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
The guest debug-information regression remains unresolved, and cross-platform CI, Nix, and container changes need build validation.
1 open issue
What changed in this PR
Separates Hyperlight’s host and guest Rust toolchains without changing the minimum supported Rust version.
Changes:
- Pins host builds to Rust 1.99.1 and guest builds to 1.94.1.
- Updates CI, Nix, containers, and contributor documentation for separate toolchains.
- Resolves compiler and lint warnings.
| File | Description |
|---|---|
| src/tests/rust_guests/rust-toolchain.toml | Pins Rust guest toolchain. |
| src/hyperlight_testing/src/tracing_subscriber.rs | Removes redundant formatting borrows. |
| src/hyperlight_host/tests/sandbox_host_tests.rs | Removes obsolete import. |
| src/hyperlight_host/build.rs | Removes redundant formatting borrow. |
| src/hyperlight_guest_capi/rust-toolchain.toml | Pins C API guest toolchain. |
| src/hyperlight_component_util/src/util.rs | Removes redundant formatting borrow. |
| src/hyperlight_component_util/src/rtypes.rs | Iterates map keys directly. |
| src/hyperlight_component_util/src/emit.rs | Iterates map values directly. |
| rust-toolchain.toml | Pins host toolchain and components. |
| flake.nix | Supports separate toolchain selection. |
| CONTRIBUTING.md | Documents guest toolchain selection. |
| .github/workflows/ValidatePullRequest.yml | Installs both toolchains. |
| .github/workflows/RustNightly.yml | Updates setup and guest cache keys. |
| .github/workflows/RegenSnapshotGoldens.yml | Installs both toolchains. |
| .github/workflows/PrimeCaches.yml | Installs both toolchains. |
| .github/workflows/dep_update_guest_locks.yml | Installs both toolchains. |
| .github/workflows/dep_run_examples.yml | Installs both toolchains. |
| .github/workflows/dep_miri.yml | Uses file-based toolchain setup. |
| .github/workflows/dep_fuzzing.yml | Installs both toolchains. |
| .github/workflows/dep_code_checks.yml | Updates setup and guest cache keys. |
| .github/workflows/dep_build_test.yml | Installs both toolchains. |
| .github/workflows/dep_build_guests.yml | Supports guest pins and older commits. |
| .github/workflows/dep_benchmarks.yml | Installs both toolchains. |
| .github/workflows/CreateRelease.yml | Installs both toolchains. |
| .github/workflows/CreateDevcontainerImage.yml | Reads and passes both toolchain versions. |
| .github/workflows/Coverage.yml | Installs both toolchains. |
| .github/workflows/copilot-setup-steps.yml | Consolidates toolchain setup. |
| .github/workflows/CargoPublish.yml | Installs both toolchains. |
| .github/workflows/CargoAudit.yml | Uses file-based toolchain selection. |
| .devcontainer/Dockerfile | Installs separate host and guest toolchains. |
Review effort: Balanced
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
Benchmark ResultsMeasured commit: kvm / amd (Linux) (➖ stable)No benchmark improved or regressed. Benchmark Resultsfunction_call_codec
payload_allocation
sandboxes
slot_pool
snapshot_files
virtq_readonly
virtq_readwrite
kvm / intel (Linux) (➖ stable)No benchmark improved or regressed. Benchmark Resultsfunction_call_codec
payload_allocation
sandboxes
slot_pool
snapshot_files
virtq_readonly
virtq_readwrite
mshv3 / amd (Linux) (➖ stable)No benchmark improved or regressed. Benchmark Resultsfunction_call_codec
payload_allocation
sandboxes
slot_pool
snapshot_files
virtq_readonly
virtq_readwrite
mshv3 / intel (Linux) (➖ stable)No benchmark improved or regressed. Benchmark Resultsfunction_call_codec
payload_allocation
sandboxes
slot_pool
snapshot_files
virtq_readonly
virtq_readwrite
hyperv-ws2025 / amd (Windows) (➖ stable)No benchmark improved or regressed. Benchmark Resultsfunction_call_codec
payload_allocation
sandboxes
slot_pool
snapshot_files
virtq_readonly
virtq_readwrite
hyperv-ws2025 / intel (Windows) (➖ stable)No benchmark improved or regressed. Benchmark Resultsfunction_call_codec
payload_allocation
sandboxes
slot_pool
snapshot_files
virtq_readonly
virtq_readwrite
Reported by |
ludfjig
reviewed
Oct 20, 2026
| return tomllib.load(source)["toolchain"]["channel"] | ||
|
|
||
| guest = channel("src/tests/rust_guests/rust-toolchain.toml") | ||
| if guest != channel("src/hyperlight_guest_capi/rust-toolchain.toml"): |
Contributor
There was a problem hiding this comment.
This check runs only on pushes to main. A PR that bumps one guest toolchain file passes CI, the C API builds with a different rustc, and this workflow fails after merge. Could the same check run in dep_code_checks.yml?
| @@ -0,0 +1,6 @@ | |||
| [toolchain] | |||
Contributor
There was a problem hiding this comment.
hyperlight-guest-capi is still a root workspace member, so the toolchain depends on the working directory. cargo build -p hyperlight-guest-capi and rust-analyzer from the root use 1.99.1, and both toolchains share target/. Would it make sense to exclude it from the root workspace like src/tests/rust_guests? Could be a follow-up.
| && rustup target add x86_64-unknown-linux-gnu \ | ||
| && rustup target add x86_64-unknown-linux-musl \ | ||
| && rustup target add x86_64-unknown-none \ | ||
| && rustup component add clippy rustfmt --toolchain ${RUST_TOOLCHAIN} \ |
Contributor
There was a problem hiding this comment.
nit: rustup default installs clippy and rustfmt with the default profile, so this line looks redundant. rustfmt in the toolchain files also seems unused since fmt runs on nightly.
Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Enables different toolchains for host and guest.
Host - 1.99.1
Guest - 1.94.1
No change to MSRV.
Minor changes to resolve warnings from move to 1.99