From 49d813b2c360e2147d3b31069698d8e1d802b708 Mon Sep 17 00:00:00 2001 From: fffonion Date: Sun, 15 Nov 2026 19:32:00 +0800 Subject: [PATCH 1/2] chore(deps): pin the gameplay host to core fc8b0c81 Move the git pins off the 805991c descriptor-line revision and refresh the frozen revision plus the catalog fingerprint, which is documented to change when the frozen pd-vm fingerprint encoding changes. --- Cargo.lock | 6 +++--- Cargo.toml | 6 +++--- README.md | 2 +- src/lib.rs | 2 +- tests/host_descriptors.rs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9e68b0e..2f339a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3747,7 +3747,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pd-host-function" version = "0.1.0" -source = "git+https://github.com/rustscript-lang/rustscript?rev=805991cfc6d81e7b9d6c042a222ecf70e3f2dab0#805991cfc6d81e7b9d6c042a222ecf70e3f2dab0" +source = "git+https://github.com/rustscript-lang/rustscript?rev=fc8b0c8179640a8ffe460a64b3690e35c2f7eb73#fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" dependencies = [ "pd-host-schema", "proc-macro2", @@ -3758,7 +3758,7 @@ dependencies = [ [[package]] name = "pd-host-schema" version = "0.1.0" -source = "git+https://github.com/rustscript-lang/rustscript?rev=805991cfc6d81e7b9d6c042a222ecf70e3f2dab0#805991cfc6d81e7b9d6c042a222ecf70e3f2dab0" +source = "git+https://github.com/rustscript-lang/rustscript?rev=fc8b0c8179640a8ffe460a64b3690e35c2f7eb73#fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" dependencies = [ "proc-macro2", "syn 2.0.119", @@ -3767,7 +3767,7 @@ dependencies = [ [[package]] name = "pd-vm" version = "0.1.0" -source = "git+https://github.com/rustscript-lang/rustscript?rev=805991cfc6d81e7b9d6c042a222ecf70e3f2dab0#805991cfc6d81e7b9d6c042a222ecf70e3f2dab0" +source = "git+https://github.com/rustscript-lang/rustscript?rev=fc8b0c8179640a8ffe460a64b3690e35c2f7eb73#fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" dependencies = [ "base64", "cranelift-codegen", diff --git a/Cargo.toml b/Cargo.toml index b6d85a1..abac016 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,12 +6,12 @@ license = "Apache-2.0" [dependencies] bevy_ecs = "0.18.1" -pd-host-function = { git = "https://github.com/rustscript-lang/rustscript", rev = "805991cfc6d81e7b9d6c042a222ecf70e3f2dab0" } -vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "805991cfc6d81e7b9d6c042a222ecf70e3f2dab0", default-features = false, features = ["runtime"] } +pd-host-function = { git = "https://github.com/rustscript-lang/rustscript", rev = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" } +vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73", default-features = false, features = ["runtime"] } web-time = "1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "805991cfc6d81e7b9d6c042a222ecf70e3f2dab0", default-features = false, features = ["cranelift-jit"] } +vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73", default-features = false, features = ["cranelift-jit"] } [dev-dependencies] bevy = { version = "0.18.1", default-features = false, features = ["default_app", "bevy_winit", "x11", "bevy_render", "bevy_core_pipeline", "bevy_sprite", "bevy_sprite_render", "bevy_text", "bevy_ui", "bevy_ui_render", "default_font", "png"] } diff --git a/README.md b/README.md index 6a48bc7..7f75cff 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Standalone Bevy integration demo for `pd-vm` / RustScript. Play in your browser: **[RustScript Arcade](https://bevy.rustscript.org/)** — [Shooter](https://bevy.rustscript.org/shooter/), [Gomoku](https://bevy.rustscript.org/gomoku/), [Xiangqi](https://bevy.rustscript.org/xiangqi/). -RustScript core is pinned to `805991cfc6d81e7b9d6c042a222ecf70e3f2dab0` through Git dependencies. This is the latest host-descriptor integration branch revision, compatible with the upstream gameplay migration; core master currently has a different host API. A sibling core checkout is no longer required. +RustScript core is pinned to `fc8b0c8179640a8ffe460a64b3690e35c2f7eb73` through Git dependencies. That revision carries the `Unit` / `Option` / `Result` host schema used by the gameplay descriptors; a sibling core checkout is not required. ## Screenshots diff --git a/src/lib.rs b/src/lib.rs index 25d65ab..31b9611 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,7 +21,7 @@ pub use shooter_runtime::{ }; /// Frozen `rustscript-lang/rustscript` revision this crate is pinned to. -pub const FROZEN_RUSTSCRIPT_REV: &str = "805991cfc6d81e7b9d6c042a222ecf70e3f2dab0"; +pub const FROZEN_RUSTSCRIPT_REV: &str = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73"; #[derive(Component, Debug, Clone, Copy, PartialEq, Eq)] pub struct Health(pub i64); diff --git a/tests/host_descriptors.rs b/tests/host_descriptors.rs index 8fb2947..7589ccb 100644 --- a/tests/host_descriptors.rs +++ b/tests/host_descriptors.rs @@ -20,9 +20,9 @@ use vm::{ /// lowercase hex digits). Bump together with [`BEVY_HOST_CATALOG_FINGERPRINT_U64`] /// when the guest catalog surface or frozen pd-vm fingerprint encoding changes. /// See [`bevy_host_catalog`] for the full policy. -const BEVY_HOST_CATALOG_FINGERPRINT_HEX: &str = "c4b1c4887b21bd02"; +const BEVY_HOST_CATALOG_FINGERPRINT_HEX: &str = "2a31bac6f8b1c529"; /// Exact `u64` form of the same digest. Keep in lockstep with the hex snapshot. -const BEVY_HOST_CATALOG_FINGERPRINT_U64: u64 = 0xc4b1c4887b21bd02; +const BEVY_HOST_CATALOG_FINGERPRINT_U64: u64 = 0x2a31bac6f8b1c529; const LISTED_HOST_SOURCE: &str = "use bevy;\nbevy::World::contains_entity();\n"; const UNLISTED_HOST_SOURCE: &str = "use bevy;\nbevy::World::not_a_host();\n"; From ed73895152785f4a6c85f77a3dc276d6464b0f9a Mon Sep 17 00:00:00 2001 From: fffonion Date: Mon, 16 Nov 2026 03:54:04 +0800 Subject: [PATCH 2/2] chore(deps): pin gameplay core to 2f433eda --- Cargo.lock | 6 +++--- Cargo.toml | 6 +++--- README.md | 2 +- src/lib.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f339a5..762af81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3747,7 +3747,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pd-host-function" version = "0.1.0" -source = "git+https://github.com/rustscript-lang/rustscript?rev=fc8b0c8179640a8ffe460a64b3690e35c2f7eb73#fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" +source = "git+https://github.com/rustscript-lang/rustscript?rev=2f433edab3f1907e8cb060e901357d7e2af016ce#2f433edab3f1907e8cb060e901357d7e2af016ce" dependencies = [ "pd-host-schema", "proc-macro2", @@ -3758,7 +3758,7 @@ dependencies = [ [[package]] name = "pd-host-schema" version = "0.1.0" -source = "git+https://github.com/rustscript-lang/rustscript?rev=fc8b0c8179640a8ffe460a64b3690e35c2f7eb73#fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" +source = "git+https://github.com/rustscript-lang/rustscript?rev=2f433edab3f1907e8cb060e901357d7e2af016ce#2f433edab3f1907e8cb060e901357d7e2af016ce" dependencies = [ "proc-macro2", "syn 2.0.119", @@ -3767,7 +3767,7 @@ dependencies = [ [[package]] name = "pd-vm" version = "0.1.0" -source = "git+https://github.com/rustscript-lang/rustscript?rev=fc8b0c8179640a8ffe460a64b3690e35c2f7eb73#fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" +source = "git+https://github.com/rustscript-lang/rustscript?rev=2f433edab3f1907e8cb060e901357d7e2af016ce#2f433edab3f1907e8cb060e901357d7e2af016ce" dependencies = [ "base64", "cranelift-codegen", diff --git a/Cargo.toml b/Cargo.toml index abac016..383fec2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,12 +6,12 @@ license = "Apache-2.0" [dependencies] bevy_ecs = "0.18.1" -pd-host-function = { git = "https://github.com/rustscript-lang/rustscript", rev = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73" } -vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73", default-features = false, features = ["runtime"] } +pd-host-function = { git = "https://github.com/rustscript-lang/rustscript", rev = "2f433edab3f1907e8cb060e901357d7e2af016ce" } +vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "2f433edab3f1907e8cb060e901357d7e2af016ce", default-features = false, features = ["runtime"] } web-time = "1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73", default-features = false, features = ["cranelift-jit"] } +vm = { package = "pd-vm", git = "https://github.com/rustscript-lang/rustscript", rev = "2f433edab3f1907e8cb060e901357d7e2af016ce", default-features = false, features = ["cranelift-jit"] } [dev-dependencies] bevy = { version = "0.18.1", default-features = false, features = ["default_app", "bevy_winit", "x11", "bevy_render", "bevy_core_pipeline", "bevy_sprite", "bevy_sprite_render", "bevy_text", "bevy_ui", "bevy_ui_render", "default_font", "png"] } diff --git a/README.md b/README.md index 7f75cff..da8cfcf 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Standalone Bevy integration demo for `pd-vm` / RustScript. Play in your browser: **[RustScript Arcade](https://bevy.rustscript.org/)** — [Shooter](https://bevy.rustscript.org/shooter/), [Gomoku](https://bevy.rustscript.org/gomoku/), [Xiangqi](https://bevy.rustscript.org/xiangqi/). -RustScript core is pinned to `fc8b0c8179640a8ffe460a64b3690e35c2f7eb73` through Git dependencies. That revision carries the `Unit` / `Option` / `Result` host schema used by the gameplay descriptors; a sibling core checkout is not required. +RustScript core is pinned to `2f433edab3f1907e8cb060e901357d7e2af016ce` through Git dependencies. That revision carries the `Unit` / `Option` / `Result` host schema used by the gameplay descriptors; a sibling core checkout is not required. ## Screenshots diff --git a/src/lib.rs b/src/lib.rs index 31b9611..30d912d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,7 +21,7 @@ pub use shooter_runtime::{ }; /// Frozen `rustscript-lang/rustscript` revision this crate is pinned to. -pub const FROZEN_RUSTSCRIPT_REV: &str = "fc8b0c8179640a8ffe460a64b3690e35c2f7eb73"; +pub const FROZEN_RUSTSCRIPT_REV: &str = "2f433edab3f1907e8cb060e901357d7e2af016ce"; #[derive(Component, Debug, Clone, Copy, PartialEq, Eq)] pub struct Health(pub i64);