Repository navigation
build: pin the VM to the frozen Unit/Option/Result core - #2
Merged
Merged
Conversation
Move the two RustScript core dependencies from b1d6cff (the parallel descriptor line) to fc8b0c8179640a8ffe460a64b3690e35c2f7eb73, the integrated core target. Cargo.lock was refreshed with `cargo update -p pd-vm -p pd-vm-nostd`; only the four rustscript packages (pd-vm, pd-vm-nostd, pd-host-function, pd-host-schema) change source, no other dependency moves.
Three expectations in the embedded tests were tied to the previous core
pin:
- the frozen-core proof compares against the pinned revision, so the
constant moves to fc8b0c81;
- the RSS dialect rejects the legacy `T?` optional annotation, so the
moved-optional-string cases declare `Option<string>` and assign
`Option::Some("hello")`;
- the wire version at this pin is 14, which the previous "unsupported
version" probe wrote verbatim, so the probe now derives
current+1 from the encoded header instead of hardcoding a value.
pd-vm at fc8b0c81 uses AtomicU64::try_update (stabilized in 1.95), which the previous 1.94.1 pin cannot compile. Move rust-toolchain.toml and the CI/release pins to the 1.96 channel, which is the version this branch is verified on.
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.
Moves micro-rustscript onto the integrated core revision
fc8b0c81(the same revision the playground and spec now use), replacing the parallel descriptor-line pinb1d6cff.pd-vmandpd-vm-nostdrevs point atfc8b0c81;Cargo.lockmoves only the four core crates (pd-vm,pd-vm-nostd,pd-host-function,pd-host-schema).compile_source_file,encode_program,decode_program,TypeSchema,Repl*,Vm,JitConfig) is stable.string?→Option<string> = Option::Some("hello")in the moved-optional cases (the parser now rejectsT?withE_RSS_NULL), and the unsupported-VMBC probe now derivescurrent + 1instead of hard-coding 14, since the wire is v14 now.pd-vmusesAtomicU64::try_update(stable since 1.95), which the old pin cannot compile;rust-toolchain.tomland the two workflow pins move together. The no_std line is unaffected.Verified on the branch:
cargo check --lockedand--features hostexit 0;cargo check --no-default-features --features esp32c3/esp32s31exit 0 for riscv32imc/riscv32imafc;cargo test --locked(14 lib + 6 frozen),--features host, and--features esp32c3,wifi,bluetooth(14 lib + 10 ffi + 7 frozen) exit 0; fmt and clippy clean. Not verified: ESP-IDF/PlatformIO firmware link and the VMBc packer (no device/toolchain run).