From addddd18d5557ed67ad4440b0684b6d3cfd69b0c Mon Sep 17 00:00:00 2001 From: Toshit Chawda Date: Sun, 19 Jan 2025 13:41:27 -0800 Subject: [PATCH] update --- rewriter/Cargo.lock | 124 ++++++++++++++++++----------------------- rewriter/Cargo.toml | 2 +- rewriter/wasm/build.sh | 5 +- 3 files changed, 57 insertions(+), 74 deletions(-) diff --git a/rewriter/Cargo.lock b/rewriter/Cargo.lock index 29155aa..0310c9b 100644 --- a/rewriter/Cargo.lock +++ b/rewriter/Cargo.lock @@ -2,18 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -67,9 +55,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "boa_ast" @@ -498,10 +486,6 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] [[package]] name = "hashbrown" @@ -727,9 +711,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -759,9 +743,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.24" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "memchr" @@ -882,9 +866,9 @@ checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" [[package]] name = "oxc" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07041e6a6e828b7e1a8f037afe3a8ea2637ea36478283e2f4d1b5997ccb70a89" +checksum = "0c55f10be3ea6bbd394a6e09bfac6038e23d2746962a08da66abece4d505673c" dependencies = [ "oxc_allocator", "oxc_ast", @@ -922,20 +906,22 @@ dependencies = [ [[package]] name = "oxc_allocator" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c6c7387edb41be3d764a115672e7be89922ce6df9756cdedfdd9b152ce788c" +checksum = "5f5b38027b943889e914774968782a2b67df6ba50f6d4e265eaa7a933a8e3075" dependencies = [ "allocator-api2", "bumpalo", + "hashbrown 0.15.2", + "rustc-hash", "simdutf8", ] [[package]] name = "oxc_ast" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9fee36a81c3ee36c4f2b3acdb9c455971e9804ea399428e773a094025f92b1" +checksum = "eb78951e98af99dfdac1e530f5a36af114d9d8a03e967b5ea68be271509183da" dependencies = [ "bitflags", "cow-utils", @@ -951,9 +937,9 @@ dependencies = [ [[package]] name = "oxc_ast_macros" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453922e0b0c402ff4f94d277d9c99c8f60757ed5a84458133758f8142b8707cf" +checksum = "f17b1dc89732a6969c6dcb274035c737db46fe1f378ce86fb6c4674db201f5ca" dependencies = [ "proc-macro2", "quote", @@ -962,19 +948,18 @@ dependencies = [ [[package]] name = "oxc_diagnostics" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da579fda6c94527afb13b9cb1fb933ba84ec61c77b74296e71c1b60a21b60447" +checksum = "0b5f7392025441f29ae145b21bc0e656530f2443fb197195b6ba39ac0d613b8b" dependencies = [ "oxc-miette", - "rustc-hash", ] [[package]] name = "oxc_ecmascript" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de4aac4c0bd05848c4523c145a656aeded13d35fd07557dbafad2c34753837" +checksum = "5993579c5c04491bfcfc9a675c9939caa9f8f5faceecc5e4d281c432bbfd4c6e" dependencies = [ "num-bigint", "num-traits", @@ -985,9 +970,9 @@ dependencies = [ [[package]] name = "oxc_estree" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5567979b29f2c6af66d912bdf68b18244e4716b1bce77da4cb5b54e036a5d7b9" +checksum = "0b216e48759b14e08652c925aa024f6b2d318a795793bbe51482718829ac9bc4" [[package]] name = "oxc_index" @@ -997,9 +982,9 @@ checksum = "5eca5d9726cd0a6e433debe003b7bc88b2ecad0bb6109f0cef7c55e692139a34" [[package]] name = "oxc_parser" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9f3b136bd0b203164e03aba7f7ce836df62a7070f847762058439f18296d582" +checksum = "08e83d2a08991efc1a79c3b42fcc77344f3de58d27c53cd9b184d17b1ed4ace3" dependencies = [ "assert-unchecked", "bitflags", @@ -1020,9 +1005,9 @@ dependencies = [ [[package]] name = "oxc_regular_expression" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecf141ba4acfed1b65b6393737dc7f15407a4bd0fff16677ca6dedac45a08468" +checksum = "d495804e1bf588e5e1a2d6fe760ff1ba53ece5cbf04e4dce531da64014869fea" dependencies = [ "oxc_allocator", "oxc_ast_macros", @@ -1036,9 +1021,9 @@ dependencies = [ [[package]] name = "oxc_span" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcf2e6f8c8f9c0019b7d82412ffe9171bdda72f8b3beba961abdfef4065f0bb" +checksum = "9a50160bfd66b0ef0acff1181c6860c61cf59d6c0d5bf05b589f1fc6dcdbafc2" dependencies = [ "compact_str", "oxc-miette", @@ -1049,12 +1034,13 @@ dependencies = [ [[package]] name = "oxc_syntax" -version = "0.44.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754c63ade3a31289e4605845e1e9ca40c34b40bf10e0e6b91634ec7ad97ade97" +checksum = "7aa0a2543f375feb387b0b94a6d72ec5b0cc6a2349518d48704189b23d6c4070" dependencies = [ "assert-unchecked", "bitflags", + "cow-utils", "nonmax", "oxc_allocator", "oxc_ast_macros", @@ -1200,9 +1186,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -1306,11 +1292,11 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "regress" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1541daf4e4ed43a0922b7969bdc2170178bcacc5dabf7e39bc508a9fa3953a7a" +checksum = "4f56e622c2378013c6c61e2bd776604c46dc1087b2dc5293275a0c20a44f0771" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.2", "memchr", ] @@ -1390,9 +1376,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "336a0c23cf42a38d9eaa7cd22c7040d04e1228a19a933890805ffd00a16437d2" dependencies = [ "itoa", "memchr", @@ -1657,12 +1643,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "walkdir" version = "2.5.0" @@ -1694,20 +1674,21 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -1719,9 +1700,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1729,9 +1710,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -1742,15 +1723,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/rewriter/Cargo.toml b/rewriter/Cargo.toml index e308bfc..6a11be1 100644 --- a/rewriter/Cargo.toml +++ b/rewriter/Cargo.toml @@ -10,7 +10,7 @@ codegen-units = 1 panic = "abort" [workspace.dependencies] -oxc = "0.44.0" +oxc = "0.47.1" [workspace.lints.clippy] pedantic = { level = "warn", priority = -1 } diff --git a/rewriter/wasm/build.sh b/rewriter/wasm/build.sh index 01dc2d2..c3f3ddd 100644 --- a/rewriter/wasm/build.sh +++ b/rewriter/wasm/build.sh @@ -2,13 +2,12 @@ set -euo pipefail shopt -s inherit_errexit -# Check for cargo and wasm-bindgen which cargo wasm-bindgen wasm-opt wasm-snip &> /dev/null || { - echo "Please install cargo, wasm-bindgen, wasm-opt, and wasm-snip! Exiting..." + echo "Please install cargo, wasm-bindgen, wasm-opt from https://github.com/WebAssembly/binaryen, and wasm-snip from https://github.com/r58playz/wasm-snip!" exit 1 } -WBG="wasm-bindgen 0.2.99" +WBG="wasm-bindgen 0.2.100" if ! [[ "$(wasm-bindgen -V)" =~ ^"$WBG" ]]; then echo "Incorrect wasm-bindgen-cli version: '$(wasm-bindgen -V)' != '$WBG'" exit 1