Skip to content

build: pin the VM to the frozen Unit/Option/Result core - #2

Merged
fffonion merged 3 commits into
masterfrom
feat/core-pin-fc8b0c81
Nov 15, 2026
Merged

fffonion merged 3 commits into
masterfrom
feat/core-pin-fc8b0c81

Conversation

@fffonion

Copy link
Copy Markdown
Contributor

Moves micro-rustscript onto the integrated core revision fc8b0c81 (the same revision the playground and spec now use), replacing the parallel descriptor-line pin b1d6cff.

  • pd-vm and pd-vm-nostd revs point at fc8b0c81; Cargo.lock moves only the four core crates (pd-vm, pd-vm-nostd, pd-host-function, pd-host-schema).
  • Production code is unchanged — the host surface micro uses (compile_source_file, encode_program, decode_program, TypeSchema, Repl*, Vm, JitConfig) is stable.
  • Test adaptations forced by the new dialect/wire: the frozen-revision constant, string? → Option<string> = Option::Some("hello") in the moved-optional cases (the parser now rejects T? with E_RSS_NULL), and the unsupported-VMBC probe now derives current + 1 instead of hard-coding 14, since the wire is v14 now.
  • Toolchain 1.94.1 → 1.96: pd-vm uses AtomicU64::try_update (stable since 1.95), which the old pin cannot compile; rust-toolchain.toml and the two workflow pins move together. The no_std line is unaffected.

Verified on the branch: cargo check --locked and --features host exit 0; cargo check --no-default-features --features esp32c3/esp32s31 exit 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).

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.
@fffonion
fffonion merged commit 24931ab into master Nov 15, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant