From cf721d45f9992fb794a95272c0a7bf17c4058070 Mon Sep 17 00:00:00 2001 From: Daniel Jacobs Date: Thu, 15 Sep 2022 15:51:45 -0400 Subject: [PATCH] Revert "web: Bump `wasm-bindgen` to 0.2.83" This reverts commit 084b252030ffe68e60e62ea24592f3d87739c521. --- .github/workflows/release_nightly.yml | 2 +- .github/workflows/test_web.yml | 2 +- Cargo.lock | 331 ++++++++++++-------------- core/Cargo.toml | 2 +- render/Cargo.toml | 2 +- render/canvas/Cargo.toml | 6 +- render/webgl/Cargo.toml | 6 +- render/wgpu/Cargo.toml | 2 +- web/Cargo.toml | 7 +- web/README.md | 2 +- web/common/Cargo.toml | 6 +- web/src/lib.rs | 16 +- 12 files changed, 184 insertions(+), 200 deletions(-) diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 9d99aa49f6c4..6728b457f980 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -318,7 +318,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: install - args: wasm-bindgen-cli --version 0.2.83 + args: wasm-bindgen-cli --version 0.2.82 - name: Setup conda uses: conda-incubator/setup-miniconda@v2 diff --git a/.github/workflows/test_web.yml b/.github/workflows/test_web.yml index a32763be62fc..5f04530d48ad 100644 --- a/.github/workflows/test_web.yml +++ b/.github/workflows/test_web.yml @@ -60,7 +60,7 @@ jobs: # wasm-bindgen-cli version must match wasm-bindgen crate version. # Be sure to update in release_nightly.yml, web/Cargo.toml and web/README.md. - name: Install wasm-bindgen - run: cargo install wasm-bindgen-cli --version 0.2.83 + run: cargo install wasm-bindgen-cli --version 0.2.82 - name: Setup conda uses: conda-incubator/setup-miniconda@v2 diff --git a/Cargo.lock b/Cargo.lock index ec86d3f5b0ba..173172d952df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -70,9 +70,9 @@ dependencies = [ [[package]] name = "android_system_properties" -version = "0.1.5" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "a20ae67ce26261f218e2b3f2f0d01887a9818283ca6fb260fa7c67e253d61c92" dependencies = [ "libc", ] @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.7.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" dependencies = [ "concurrent-queue", "event-listener", @@ -244,9 +244,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ "generic-array", ] @@ -317,9 +317,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" [[package]] name = "cache-padded" @@ -406,11 +406,10 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0" dependencies = [ - "iana-time-zone", "js-sys", "num-integer", "num-traits", @@ -432,9 +431,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.21" +version = "3.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7" +checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" dependencies = [ "atty", "bitflags", @@ -551,9 +550,9 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.6" +version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" dependencies = [ "bytes", "memchr", @@ -561,22 +560,23 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" dependencies = [ "cache-padded", ] [[package]] name = "console" -version = "0.15.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" dependencies = [ "encode_unicode", "libc", "once_cell", + "regex", "terminal_size", "unicode-width", "winapi", @@ -751,9 +751,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] @@ -855,9 +855,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.23" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", "syn", @@ -1054,6 +1054,15 @@ dependencies = [ "dasp_sample", ] +[[package]] +name = "deflate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" +dependencies = [ + "adler32", +] + [[package]] name = "derive-try-from-primitive" version = "1.0.0" @@ -1124,15 +1133,15 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "embed-resource" -version = "1.7.2" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc24ff8d764818e9ab17963b0593c535f077a513f565e75e4352d758bc4d8c0" +checksum = "936c1354206a875581696369aef920e12396e93bbd251c43a7a3f3fa85023a7d" dependencies = [ "cc", "rustc_version", @@ -1222,9 +1231,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "exporter" @@ -1244,15 +1253,16 @@ dependencies = [ [[package]] name = "exr" -version = "1.5.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c26a90d9dd411a3d119d6f55752fb4c134ca243250c32fb9cab7b2561638d2" +checksum = "14cc0e06fb5f67e5d6beadf3a382fec9baca1aa751c6d5368fdeee7e5932c215" dependencies = [ "bit_field", + "deflate", "flume", "half", + "inflate", "lebe", - "miniz_oxide", "smallvec", "threadpool", ] @@ -1519,9 +1529,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -1623,13 +1633,13 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.3" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +checksum = "a538f217be4d405ff4719a283ca68323cc2384003eca5baaa87501e821c81dda" dependencies = [ "bitflags", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -1687,13 +1697,19 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "heck" version = "0.4.0" @@ -1723,7 +1739,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.3", + "itoa 1.0.2", ] [[package]] @@ -1732,20 +1748,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "iana-time-zone" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0" -dependencies = [ - "android_system_properties", - "core-foundation-sys 0.8.3", - "js-sys", - "once_cell", - "wasm-bindgen", - "winapi", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1788,7 +1790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -1803,11 +1805,20 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "inflate" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +dependencies = [ + "adler32", +] + [[package]] name = "inplace_it" -version = "0.3.5" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e567468c50f3d4bc7397702e09b380139f9b9288b4e909b070571007f8b5bf78" +checksum = "67f0347836f3f6362c1e7efdadde2b1c4b4556d211310b70631bae7eb692070b" [[package]] name = "instant" @@ -1856,9 +1867,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "jni" @@ -1900,9 +1911,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" dependencies = [ "wasm-bindgen", ] @@ -1932,9 +1943,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lebe" -version = "0.5.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" +checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff" [[package]] name = "lexical-core" @@ -1951,9 +1962,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.132" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libflate" @@ -2009,9 +2020,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ "autocfg", "scopeguard", @@ -2039,9 +2050,9 @@ dependencies = [ [[package]] name = "lyon_algorithms" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d53c2fefbc729e3c206d53d0cc7ccf90d3d31614f32e329f7e042d55e6b0573" +checksum = "e11bf139ada9104d99cbbf1834ffbcda97d0e146b1779a08c31a289c6dc2cce9" dependencies = [ "lyon_path", ] @@ -2059,22 +2070,21 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898d82012beaa3239a53e96360d93fda51f4e3b449672944982727020572ef09" +checksum = "aa420866147eed0e63fc1e3be5ea45e88d1cc779b2f5a79d6cfd39720f95ac44" dependencies = [ "lyon_geom", ] [[package]] name = "lyon_tessellation" -version = "1.0.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374efef3047dc01cc86b32058d1dd0f675aba80d3d63df82cdeb160c69c4e903" +checksum = "5a5783427c5ffede511f2823df3f025a267dc377df00c70ab7775c621c0e9f08" dependencies = [ "float_next_after", "lyon_path", - "thiserror", ] [[package]] @@ -2177,9 +2187,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", ] @@ -2289,18 +2299,17 @@ dependencies = [ [[package]] name = "ndk-glue" -version = "0.7.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" +checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" dependencies = [ + "lazy_static", "libc", "log", - "ndk 0.7.0", + "ndk 0.6.0", "ndk-context", "ndk-macro", - "ndk-sys 0.4.0", - "once_cell", - "parking_lot 0.12.1", + "ndk-sys 0.3.0", ] [[package]] @@ -2398,18 +2407,6 @@ dependencies = [ "memoffset", ] -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - [[package]] name = "nom" version = "6.1.2" @@ -2609,9 +2606,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "ouroboros" @@ -2731,18 +2728,18 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ "proc-macro2", "quote", @@ -2781,11 +2778,10 @@ dependencies = [ [[package]] name = "polling" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" +checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" dependencies = [ - "autocfg", "cfg-if 1.0.0", "libc", "log", @@ -2813,20 +2809,19 @@ dependencies = [ [[package]] name = "primal-check" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b264861209b0641a9b7571695029f516698bd3f2bf46eb61fca408675630b8c" +checksum = "01419cee72c1a1ca944554e23d83e483e1bccf378753344e881de28b5487511d" dependencies = [ "num-integer", ] [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ - "once_cell", "thiserror", "toml", ] @@ -2973,9 +2968,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" dependencies = [ "bitflags", ] @@ -3291,7 +3286,6 @@ dependencies = [ "ruffle_video_software", "ruffle_web_common", "serde", - "serde-wasm-bindgen", "thiserror", "url", "wasm-bindgen", @@ -3363,9 +3357,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "safe_arch" @@ -3415,9 +3409,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" -version = "1.0.13" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" [[package]] name = "serde" @@ -3428,17 +3422,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfc62771e7b829b517cb213419236475f434fb480eddd76112ae182d274434a" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde-xml-rs" version = "0.6.0" @@ -3469,7 +3452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "indexmap", - "itoa 1.0.3", + "itoa 1.0.2", "ryu", "serde", ] @@ -3558,9 +3541,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi", @@ -3826,18 +3809,18 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.9" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", "log", @@ -3859,9 +3842,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ "once_cell", ] @@ -3906,9 +3889,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" @@ -4017,19 +4000,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" dependencies = [ "cfg-if 1.0.0", + "serde", + "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" dependencies = [ "bumpalo", "log", @@ -4042,9 +4027,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4054,9 +4039,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4064,9 +4049,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", @@ -4077,20 +4062,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" [[package]] name = "wayland-client" -version = "0.29.5" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +checksum = "91223460e73257f697d9e23d401279123d36039a3f7a449e983f123292d4458f" dependencies = [ "bitflags", "downcast-rs", "libc", - "nix 0.24.2", + "nix 0.22.3", "scoped-tls", "wayland-commons", "wayland-scanner", @@ -4099,11 +4084,11 @@ dependencies = [ [[package]] name = "wayland-commons" -version = "0.29.5" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e" dependencies = [ - "nix 0.24.2", + "nix 0.22.3", "once_cell", "smallvec", "wayland-sys", @@ -4111,20 +4096,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.29.5" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd" dependencies = [ - "nix 0.24.2", + "nix 0.22.3", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.29.5" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741" dependencies = [ "bitflags", "wayland-client", @@ -4134,9 +4119,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.29.5" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "39a1ed3143f7a143187156a2ab52742e89dac33245ba505c17224df48939f9e0" dependencies = [ "proc-macro2", "quote", @@ -4145,9 +4130,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.29.5" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4" dependencies = [ "dlib", "lazy_static", @@ -4162,9 +4147,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" dependencies = [ "js-sys", "wasm-bindgen", @@ -4177,7 +4162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01d62aa75495ab67cdc273d0b95cc76bcedfea2ba28338a4cf9b4137949dfac5" dependencies = [ "jni", - "ndk-glue 0.7.0", + "ndk-glue 0.6.2", "objc", "raw-window-handle 0.5.0", "url", @@ -4312,9 +4297,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -4492,9 +4477,9 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.20.0" +version = "2.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6" +checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59" dependencies = [ "lazy_static", "libc", diff --git a/core/Cargo.toml b/core/Cargo.toml index 35f3100fa638..d6758f9f51fa 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -48,7 +48,7 @@ enumset = "1.0.11" version = "0.3.24" [target.'cfg(target_family = "wasm")'.dependencies.wasm-bindgen-futures] -version = "0.4.33" +version = "0.4.32" [features] default = [] diff --git a/render/Cargo.toml b/render/Cargo.toml index b5711e8cd626..9b1d7cc69ac0 100644 --- a/render/Cargo.toml +++ b/render/Cargo.toml @@ -15,7 +15,7 @@ smallvec = { version = "1.9.0", features = ["union"] } downcast-rs = "1.2.0" lyon = { version = "1.0.0", optional = true } thiserror = "1.0" -wasm-bindgen = { version = "=0.2.83", optional = true } +wasm-bindgen = { version = "=0.2.82", optional = true } [dependencies.jpeg-decoder] version = "0.2.6" diff --git a/render/canvas/Cargo.toml b/render/canvas/Cargo.toml index 39a8a1d60b2c..0c19e550f098 100644 --- a/render/canvas/Cargo.toml +++ b/render/canvas/Cargo.toml @@ -6,16 +6,16 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -js-sys = "0.3.60" +js-sys = "0.3.59" log = "0.4" ruffle_web_common = { path = "../../web/common" } -wasm-bindgen = "=0.2.83" +wasm-bindgen = "=0.2.82" fnv = "1.0.7" ruffle_render = { path = "..", features = ["web"] } swf = { path = "../../swf" } [dependencies.web-sys] -version = "0.3.60" +version = "0.3.58" features = [ "CanvasGradient", "CanvasPattern", "CanvasRenderingContext2d", "CanvasWindingRule", "CssStyleDeclaration", "Document", "DomMatrix", "Element", "HtmlCanvasElement", "ImageData", "Navigator", "Path2d", "SvgMatrix", diff --git a/render/webgl/Cargo.toml b/render/webgl/Cargo.toml index 582ca4afe245..d76d340d9bf3 100644 --- a/render/webgl/Cargo.toml +++ b/render/webgl/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -js-sys = "0.3.60" +js-sys = "0.3.59" log = "0.4" ruffle_web_common = { path = "../../web/common" } ruffle_render = { path = "..", features = ["tessellator", "web"] } -wasm-bindgen = "=0.2.83" +wasm-bindgen = "=0.2.82" bytemuck = { version = "1.12.1", features = ["derive"] } fnv = "1.0.7" swf = { path = "../../swf" } thiserror = "1.0" [dependencies.web-sys] -version = "0.3.60" +version = "0.3.58" features = [ "HtmlCanvasElement", "OesVertexArrayObject", "WebGl2RenderingContext", "WebGlBuffer", "WebglDebugRendererInfo", "WebGlFramebuffer", "WebGlProgram", "WebGlRenderbuffer", "WebGlRenderingContext", "WebGlShader", "WebGlTexture", diff --git a/render/wgpu/Cargo.toml b/render/wgpu/Cargo.toml index 445e31f02496..6c96bc09be1d 100644 --- a/render/wgpu/Cargo.toml +++ b/render/wgpu/Cargo.toml @@ -26,7 +26,7 @@ version = "0.3.24" # wasm [target.'cfg(target_family = "wasm")'.dependencies.web-sys] -version = "0.3.60" +version = "0.3.58" features = ["HtmlCanvasElement"] [features] diff --git a/web/Cargo.toml b/web/Cargo.toml index 6de2f0d696dc..fad93a3cae22 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -30,7 +30,7 @@ wgpu-webgl = ["ruffle_render_wgpu", "ruffle_render_wgpu/webgl"] console_error_panic_hook = { version = "0.1.7", optional = true } console_log = { version = "0.2", optional = true } generational-arena = "0.2.8" -js-sys = "0.3.60" +js-sys = "0.3.59" log = { version = "0.4", features = ["serde"] } ruffle_render_canvas = { path = "../render/canvas", optional = true } ruffle_web_common = { path = "common" } @@ -38,9 +38,8 @@ ruffle_render_webgl = { path = "../render/webgl", optional = true } ruffle_render_wgpu = { path = "../render/wgpu", optional = true } ruffle_video_software = { path = "../video/software" } url = "2.3.1" -wasm-bindgen = "=0.2.83" +wasm-bindgen = { version = "=0.2.82", features = ["serde-serialize"] } wasm-bindgen-futures = "0.4.32" -serde-wasm-bindgen = "0.4.3" chrono = { version = "0.4", features = ["wasmbind"] } getrandom = { version = "0.2", features = ["js"] } serde = { version = "1.0.144", features = ["derive"] } @@ -53,7 +52,7 @@ default-features = false features = ["audio", "nellymoser", "symphonia", "wasm-bindgen"] [dependencies.web-sys] -version = "0.3.60" +version = "0.3.58" features = [ "AddEventListenerOptions", "AudioBuffer", "AudioBufferSourceNode", "AudioContext", "AudioDestinationNode", "AudioNode", "AudioParam", "Blob", "BlobPropertyBag", "ChannelMergerNode", diff --git a/web/README.md b/web/README.md index 0cb10b15d99b..f6f000628660 100644 --- a/web/README.md +++ b/web/README.md @@ -58,7 +58,7 @@ Note that npm 7 or newer is required. It should come bundled with Node.js 15 or -This can be installed with `cargo install wasm-bindgen-cli --version 0.2.83`. Be sure to install this specific version of `wasm-bindgen-cli` to match the version used by Ruffle. +This can be installed with `cargo install wasm-bindgen-cli --version 0.2.82`. Be sure to install this specific version of `wasm-bindgen-cli` to match the version used by Ruffle. #### Binaryen diff --git a/web/common/Cargo.toml b/web/common/Cargo.toml index 743be98d0caf..e602d9c6f86e 100644 --- a/web/common/Cargo.toml +++ b/web/common/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -js-sys = "0.3.60" +js-sys = "0.3.59" log = "0.4" -wasm-bindgen = "=0.2.83" +wasm-bindgen = "=0.2.82" [dependencies.web-sys] -version = "0.3.60" +version = "0.3.58" features = ["Window"] diff --git a/web/src/lib.rs b/web/src/lib.rs index 38c143270c0b..6db0a16bbdef 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -204,8 +204,8 @@ pub struct Ruffle(Index); impl Ruffle { #[allow(clippy::new_ret_no_self)] #[wasm_bindgen(constructor)] - pub fn new(parent: HtmlElement, js_player: JavascriptPlayer, config: JsValue) -> Promise { - let config: Config = serde_wasm_bindgen::from_value(config).unwrap_or_default(); + pub fn new(parent: HtmlElement, js_player: JavascriptPlayer, config: &JsValue) -> Promise { + let config: Config = config.into_serde().unwrap_or_default(); wasm_bindgen_futures::future_to_promise(async move { if RUFFLE_GLOBAL_PANIC.is_completed() { // If an actual panic happened, then we can't trust the state it left us in. @@ -224,9 +224,9 @@ impl Ruffle { /// Stream an arbitrary movie file from (presumably) the Internet. /// /// This method should only be called once per player. - pub fn stream_from(&mut self, movie_url: String, parameters: JsValue) -> Result<(), JsValue> { + pub fn stream_from(&mut self, movie_url: String, parameters: &JsValue) -> Result<(), JsValue> { let _ = self.with_core_mut(|core| { - let parameters_to_load = parse_movie_parameters(¶meters); + let parameters_to_load = parse_movie_parameters(parameters); let ruffle = *self; let on_metadata = move |swf_header: &ruffle_core::swf::HeaderExt| { @@ -241,10 +241,10 @@ impl Ruffle { /// Play an arbitrary movie on this instance. /// /// This method should only be called once per player. - pub fn load_data(&mut self, swf_data: Uint8Array, parameters: JsValue) -> Result<(), JsValue> { + pub fn load_data(&mut self, swf_data: Uint8Array, parameters: &JsValue) -> Result<(), JsValue> { let mut movie = SwfMovie::from_data(&swf_data.to_vec(), None, None) .map_err(|e| format!("Error loading movie: {}", e))?; - movie.append_parameters(parse_movie_parameters(¶meters)); + movie.append_parameters(parse_movie_parameters(parameters)); self.on_metadata(movie.header()); @@ -289,7 +289,7 @@ impl Ruffle { pub fn prepare_context_menu(&mut self) -> JsValue { self.with_core_mut(|core| { let info = core.prepare_context_menu(); - serde_wasm_bindgen::to_value(&info).unwrap_or(JsValue::UNDEFINED) + JsValue::from_serde(&info).unwrap_or(JsValue::UNDEFINED) }) .unwrap_or(JsValue::UNDEFINED) } @@ -1032,7 +1032,7 @@ impl Ruffle { is_action_script_3: swf_header.is_action_script_3(), }; - if let Ok(value) = serde_wasm_bindgen::to_value(&metadata) { + if let Ok(value) = JsValue::from_serde(&metadata) { instance.js_player.set_metadata(value); } });