From 2a73ff7fbf214f635ab6d8cf2d61b31e6aaf0433 Mon Sep 17 00:00:00 2001 From: Peter Hayman Date: Wed, 27 Nov 2024 15:53:05 +0700 Subject: [PATCH] patch --- Cargo.lock | 119 ++++++++++++++++++++++++----------------------------- Cargo.toml | 6 +-- 2 files changed, 57 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 289d50bd..45dc568b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "accesskit" @@ -264,7 +264,7 @@ version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.8.5", + "libloading", ] [[package]] @@ -434,7 +434,7 @@ dependencies = [ "beetmash", "bevy", "console_log", - "forky 0.2.0-rc.6", + "forky", "log", "pretty_env_logger", "serde", @@ -454,7 +454,7 @@ dependencies = [ "beet_spatial", "beetmash", "bevy", - "forky 0.2.0-rc.6", + "forky", "log", "pretty_env_logger", "rand", @@ -510,7 +510,7 @@ dependencies = [ "candle-transformers", "console_error_panic_hook", "console_log", - "forky 0.2.0-rc.6", + "forky", "futures", "hf-hub", "js-sys", @@ -553,7 +553,7 @@ dependencies = [ "beetmash", "bevy", "extend", - "forky 0.2.0-rc.6", + "forky", "log", "pretty_env_logger", "rand", @@ -566,6 +566,8 @@ dependencies = [ [[package]] name = "beetmash" version = "0.0.6-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b481770ef158c539a65849d5eb4a4f5a3416e68ab8e000c05ab5dd5b8cba61" dependencies = [ "beetmash_core", "beetmash_net", @@ -575,13 +577,15 @@ dependencies = [ [[package]] name = "beetmash_core" version = "0.0.6-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3755e60e3dda8ea4d9bd4150a61568b332846bc8c30970c7f23427c427fc772" dependencies = [ "anyhow", "beetmash_net", "beetmash_scene", "bevy", "extend", - "forky 0.2.0-rc.6", + "forky", "log", "serde", "sweet", @@ -590,13 +594,15 @@ dependencies = [ [[package]] name = "beetmash_net" version = "0.0.6-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a277cb86ac5c73bafd8dd34b6990418633b442c5dbe685a37cca7789d73faea" dependencies = [ "anyhow", "bevy", "bincode", "extend", "flume", - "forky 0.2.0-rc.6", + "forky", "js-sys", "log", "ron", @@ -612,12 +618,14 @@ dependencies = [ [[package]] name = "beetmash_scene" version = "0.0.6-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7854eec6c63d113448b938f8687da2c29c5bc3e992d8d0a88c18a0d1ff5d222f" dependencies = [ "anyhow", "bevy", "bevy_reflect", "extend", - "forky 0.2.0-rc.6", + "forky", "log", "serde", "serde_json", @@ -1884,7 +1892,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.5", + "libloading", ] [[package]] @@ -2318,7 +2326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.7.4", + "libloading", "winapi", ] @@ -2492,7 +2500,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading", ] [[package]] @@ -2541,7 +2549,7 @@ dependencies = [ "beet_examples", "beetmash", "bevy", - "forky 0.2.0-rc.6", + "forky", "log", "pretty_env_logger", "rand", @@ -2866,31 +2874,26 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "forky" -version = "0.2.0-rc.6" -dependencies = [ - "forky_bevy", - "forky_core 0.2.0-rc.6", - "forky_web", -] - -[[package]] -name = "forky" -version = "0.2.0-rc.6" +version = "0.2.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac29aa45bd05424ca52de937458c1d5fb887192d45411f6826e51f1ac0a3d1c2" +checksum = "e95052c97ed67087cb1ba11e82c1951c8f1b9611b72bbc12d478cc1bfd2db25f" dependencies = [ - "forky_core 0.2.0-rc.6 (registry+https://github.com/rust-lang/crates.io-index)", + "forky_bevy", + "forky_core", "forky_fs", + "forky_web", ] [[package]] name = "forky_bevy" -version = "0.2.0-rc.6" +version = "0.2.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19372d2fe7a25c6ccf9cdb1b2523b8968dd8ca0b39e2460d4e568d27684e41a8" dependencies = [ "anyhow", "bevy", "extend", - "forky_core 0.2.0-rc.6", + "forky_core", "forky_web", "js-sys", "rand", @@ -2898,21 +2901,9 @@ dependencies = [ [[package]] name = "forky_core" -version = "0.2.0-rc.6" -dependencies = [ - "anyhow", - "extend", - "getrandom", - "log", - "num-traits", - "rand", -] - -[[package]] -name = "forky_core" -version = "0.2.0-rc.6" +version = "0.2.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f5edc9b4f6307e74a3c8d2b73b7612be6f317324acbb6eb0ccbfca91fa946a" +checksum = "be1daff0e1aa873e932aede321d643ba047d0e002386a5b6b47a62f1bfaa2d62" dependencies = [ "anyhow", "extend", @@ -2924,15 +2915,15 @@ dependencies = [ [[package]] name = "forky_fs" -version = "0.2.0-rc.6" +version = "0.2.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33c69fe57176cb4c98989aab14fe76a6939f3ee1b1db55da340550866f0d52" +checksum = "8dc2dcc6831baace703aaafee72879b974d7e30c1ab55bc8b6ca55f65d2d9f54" dependencies = [ "anyhow", "clap", "crossterm", "extend", - "forky_core 0.2.0-rc.6 (registry+https://github.com/rust-lang/crates.io-index)", + "forky_core", "futures", "gag", "glob", @@ -2945,12 +2936,14 @@ dependencies = [ [[package]] name = "forky_web" -version = "0.2.0-rc.6" +version = "0.2.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ac6bdede40516f6afe541399440ad4bcfb87b1adf4800fe158b52f89c422e9b" dependencies = [ "anyhow", "console_error_panic_hook", "extend", - "forky_core 0.2.0-rc.6", + "forky_core", "forky_web_macros", "js-sys", "log", @@ -2963,7 +2956,9 @@ dependencies = [ [[package]] name = "forky_web_macros" -version = "0.2.0-rc.6" +version = "0.2.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7bad1eb30ffda4c716434447c1ade6ef1a4fdb55c7f15a0df2fac8e2580a9ac" dependencies = [ "anyhow", "proc-macro2", @@ -3283,7 +3278,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows 0.52.0", + "windows 0.58.0", ] [[package]] @@ -3485,7 +3480,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.5", + "libloading", "thiserror", "widestring", "winapi", @@ -3845,7 +3840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.5", + "libloading", "pkg-config", ] @@ -3907,16 +3902,6 @@ version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.5" @@ -5653,7 +5638,9 @@ dependencies = [ [[package]] name = "sweet" -version = "0.2.0-rc.4" +version = "0.2.0-rc.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5f1bf2e26387ab582a23d87d42c775f4e54af7c38684a2724316f0908d8ae9" dependencies = [ "anyhow", "backtrace", @@ -5663,7 +5650,7 @@ dependencies = [ "crossterm", "extend", "flume", - "forky 0.2.0-rc.6 (registry+https://github.com/rust-lang/crates.io-index)", + "forky", "futures", "gag", "getrandom", @@ -5680,7 +5667,9 @@ dependencies = [ [[package]] name = "sweet_macros" -version = "0.2.0-rc.4" +version = "0.2.0-rc.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e093d252a21622f32fb2093d8e03e1f1e358be0ea36f351b30f516d67490050" dependencies = [ "anyhow", "proc-macro2", @@ -6412,7 +6401,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.7.4", + "libloading", "log", "metal", "naga", @@ -6880,7 +6869,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.5", + "libloading", "once_cell", "rustix", "x11rb-protocol", diff --git a/Cargo.toml b/Cargo.toml index 90b6fc05..cdd6fc58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,12 +41,12 @@ beet_examples = { path = "crates/beet_examples", version = "0.0.4-rc.4" } emby = { path = "crates/emby", version = "0.0.4-rc.4" } ## local -beetmash = { version = "0.0.6-rc.7" } -forky = { version = "0.2.0-rc.6", features = [ +beetmash = { version = "0.0.6-rc.8" } +forky = { version = "0.2.0-rc.8", features = [ "bevy", "web", ] } -sweet = { version = "0.2.0-rc.4", features = ["bevy"] } +sweet = { version = "0.2.0-rc.5", features = ["bevy"] } #💡 game bevy = { version = "0.15.0-rc.1", default-features = false, features = [