From b4a652c68ccccf7e82f8b21d86684fbbbf4ab044 Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Fri, 12 Jun 2026 06:58:14 +0200 Subject: [PATCH] fix: ci --- Cargo.lock | 144 +++++++++++++++++++++-------------------- Cargo.toml | 2 +- pumpkin-world/build.rs | 2 +- 3 files changed, 77 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b7f609fd5..eb1efc232 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2010,9 +2010,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" [[package]] name = "lz4-java-wrc" @@ -2078,9 +2078,9 @@ checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" [[package]] name = "memfd" @@ -2808,7 +2808,7 @@ dependencies = [ "serde_json", "tracing", "tracing-serde-structured", - "wit-bindgen 0.57.1", + "wit-bindgen 0.58.0", ] [[package]] @@ -4173,16 +4173,6 @@ dependencies = [ "wasmparser 0.244.0", ] -[[package]] -name = "wasm-encoder" -version = "0.247.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b6733b8b91d010a6ac5b0fb237dc46a19650bc4c67db66857e2e787d437204" -dependencies = [ - "leb128fmt", - "wasmparser 0.247.0", -] - [[package]] name = "wasm-encoder" version = "0.248.0" @@ -4193,6 +4183,16 @@ dependencies = [ "wasmparser 0.248.0", ] +[[package]] +name = "wasm-encoder" +version = "0.251.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a879a421bd17c528b74721b2abf4c62e8f1d1889c2ba8c3c50d02deaf2ce395" +dependencies = [ + "leb128fmt", + "wasmparser 0.251.0", +] + [[package]] name = "wasm-metadata" version = "0.244.0" @@ -4207,14 +4207,14 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.247.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665fe59e56cc9b419ca6fcca56673e3421d1a5011e3b65caf6b726fd9e041d10" +checksum = "5f998ccc6e012f7b86865eb2a106c8a0422017a1a88977ce01a69f2244be2e57" dependencies = [ "anyhow", "indexmap", - "wasm-encoder 0.247.0", - "wasmparser 0.247.0", + "wasm-encoder 0.251.0", + "wasmparser 0.251.0", ] [[package]] @@ -4229,18 +4229,6 @@ dependencies = [ "semver", ] -[[package]] -name = "wasmparser" -version = "0.247.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6fb4c2bee46c5ea4d40f8cdb5c131725cd976718ec56f1c8e82fbde5fa2a80" -dependencies = [ - "bitflags", - "hashbrown 0.17.1", - "indexmap", - "semver", -] - [[package]] name = "wasmparser" version = "0.248.0" @@ -4254,6 +4242,18 @@ dependencies = [ "serde", ] +[[package]] +name = "wasmparser" +version = "0.251.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437970b35b1a85cfde9c74b2398352d8d653f3bd8e3a3db0c063ea8f5b4b36ff" +dependencies = [ + "bitflags", + "hashbrown 0.17.1", + "indexmap", + "semver", +] + [[package]] name = "wasmprinter" version = "0.248.0" @@ -4953,8 +4953,14 @@ name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + +[[package]] +name = "wit-bindgen" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a43552cfa071f246cfd99e5dbb23710dfe7336b3259e09339818483359470749" dependencies = [ - "wit-bindgen-rust-macro 0.57.1", + "wit-bindgen-rust-macro 0.58.0", ] [[package]] @@ -4970,13 +4976,13 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.57.1" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dee27a2dc20d1008016c742ec9fc6ea498492994ba3750be7454cbc97ff04c" +checksum = "4738d1c9a78e97bc7f664bfafd5d8e67d7bb26faa5c41e6d628e8bbdad3ec351" dependencies = [ "anyhow", "heck", - "wit-parser 0.247.0", + "wit-parser 0.251.0", ] [[package]] @@ -4997,18 +5003,18 @@ dependencies = [ [[package]] name = "wit-bindgen-rust" -version = "0.57.1" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5007dae772945b7a5003d69d90a3a4a78929d41f19d004e980c4259a6af4484" +checksum = "1130ce1f531bc9f9a75922244aa773bf5e2117fda1ef4a86b9f98d6b8135eb46" dependencies = [ "anyhow", "heck", "indexmap", "prettyplease", "syn", - "wasm-metadata 0.247.0", - "wit-bindgen-core 0.57.1", - "wit-component 0.247.0", + "wasm-metadata 0.251.0", + "wit-bindgen-core 0.58.0", + "wit-component 0.251.0", ] [[package]] @@ -5028,17 +5034,17 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.57.1" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af9237d678e3513ad24e96fe98beacdc0db6405284ba2a2400418cf0d42caa89" +checksum = "07296369e4d598e7e79b64eef66f724d83324ea671bcf677d78fc5cf92604ae5" dependencies = [ "anyhow", "prettyplease", "proc-macro2", "quote", "syn", - "wit-bindgen-core 0.57.1", - "wit-bindgen-rust 0.57.1", + "wit-bindgen-core 0.58.0", + "wit-bindgen-rust 0.58.0", ] [[package]] @@ -5062,9 +5068,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.247.0" +version = "0.251.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d567162a6b9843080e5e0053f696623ff694bae8ae017c9ec536d1873bbe3d8" +checksum = "83a5e60173c413659c689f0581b0cf5d1a2404077568f9ffdce748a9eb2fc913" dependencies = [ "anyhow", "bitflags", @@ -5073,10 +5079,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.247.0", - "wasm-metadata 0.247.0", - "wasmparser 0.247.0", - "wit-parser 0.247.0", + "wasm-encoder 0.251.0", + "wasm-metadata 0.251.0", + "wasmparser 0.251.0", + "wit-parser 0.251.0", ] [[package]] @@ -5097,25 +5103,6 @@ dependencies = [ "wasmparser 0.244.0", ] -[[package]] -name = "wit-parser" -version = "0.247.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ffe4064318cdf3c08cb99343b44c039fcefe61ccdf58aa9975285f13d74d1fc" -dependencies = [ - "anyhow", - "hashbrown 0.17.1", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.247.0", -] - [[package]] name = "wit-parser" version = "0.248.0" @@ -5135,6 +5122,25 @@ dependencies = [ "wasmparser 0.248.0", ] +[[package]] +name = "wit-parser" +version = "0.251.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e960732e824fab95099971a09e638979347c94ca48568d3c854c945729196947" +dependencies = [ + "anyhow", + "hashbrown 0.17.1", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.251.0", +] + [[package]] name = "writeable" version = "0.6.3" diff --git a/Cargo.toml b/Cargo.toml index 7cefe8c0a..0b7a2de4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -195,7 +195,7 @@ wasmtime-wasi = { version = "45.0", default-features = false, features = ["p2"] wasmtime-wasi-http = { version = "45.0", default-features = false, features = ["p2", "default-send-request"] } # needed for interacting with wasmtime-wasi-http - keep in sync hyper = { version = "^1.10", default-features = false } -wit-bindgen = { version = "0.57", default-features = false, features = ["macros"] } +wit-bindgen = { version = "0.58", default-features = false, features = ["macros"] } postcard = { version = "1.1", default-features = false, features = ["alloc"] } tracing-serde-structured = { version = "0.4", default-features = false } diff --git a/pumpkin-world/build.rs b/pumpkin-world/build.rs index ea68b01fc..a203903fc 100644 --- a/pumpkin-world/build.rs +++ b/pumpkin-world/build.rs @@ -63,7 +63,7 @@ fn process_dir( let template_name = format!("{}/{}", prefix, name.strip_suffix(".nbt").unwrap()); let abs_path = path.canonicalize().unwrap(); code.push_str(&format!( - " \"{}\" => Some(include_bytes!(\"{}\")),\n", + " \"{}\" => Some(include_bytes!(r#\"{}\"#)),\n", template_name, abs_path.display() ));