From e22a703dfd7591ccfd143e1e7ade4c2d2ba55b55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:52:36 -0500 Subject: [PATCH] Bump the rust-dependencies group across 1 directory with 8 updates (#4021) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump the rust-dependencies group across 1 directory with 8 updates Bumps the rust-dependencies group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.19` | `4.5.20` | | [serde_json](https://github.com/serde-rs/json) | `1.0.128` | `1.0.132` | | [trybuild](https://github.com/dtolnay/trybuild) | `1.0.99` | `1.0.101` | | [wasm-bindgen](https://github.com/rustwasm/wasm-bindgen) | `0.2.93` | `0.2.95` | | [wasm-bindgen-test](https://github.com/rustwasm/wasm-bindgen) | `0.3.43` | `0.3.45` | | [syn](https://github.com/dtolnay/syn) | `2.0.79` | `2.0.82` | | [proc-macro2](https://github.com/dtolnay/proc-macro2) | `1.0.86` | `1.0.88` | | [bytemuck](https://github.com/Lokathor/bytemuck) | `1.18.0` | `1.19.0` | Updates `clap` from 4.5.19 to 4.5.20 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.19...clap_complete-v4.5.20) Updates `serde_json` from 1.0.128 to 1.0.132 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/1.0.128...1.0.132) Updates `trybuild` from 1.0.99 to 1.0.101 - [Release notes](https://github.com/dtolnay/trybuild/releases) - [Commits](https://github.com/dtolnay/trybuild/compare/1.0.99...1.0.101) Updates `wasm-bindgen` from 0.2.93 to 0.2.95 - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/compare/0.2.93...0.2.95) Updates `wasm-bindgen-test` from 0.3.43 to 0.3.45 - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/commits) Updates `syn` from 2.0.79 to 2.0.82 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.79...2.0.82) Updates `proc-macro2` from 1.0.86 to 1.0.88 - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.86...1.0.88) Updates `bytemuck` from 1.18.0 to 1.19.0 - [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md) - [Commits](https://github.com/Lokathor/bytemuck/compare/v1.18.0...v1.19.0) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: trybuild dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: wasm-bindgen dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: wasm-bindgen-test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: proc-macro2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: bytemuck dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies ... Signed-off-by: dependabot[bot] * Fix wasm dependencies --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: José Julián Espina --- Cargo.lock | 71 ++++++++++++++++++--------------- Cargo.toml | 16 ++++---- core/parser/src/lexer/number.rs | 17 ++++---- ffi/wasm/Cargo.toml | 2 +- ffi/wasm/tests/web.rs | 10 ++++- 5 files changed, 64 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12f26aaccd..815a6a504b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -608,9 +608,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] @@ -739,9 +739,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -749,9 +749,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -2077,9 +2077,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -2650,9 +2650,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -2993,9 +2993,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3191,9 +3191,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -3226,6 +3226,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "target-triple" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078" + [[package]] name = "temporal_rs" version = "0.0.3" @@ -3526,14 +3532,15 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.99" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8" +checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4" dependencies = [ "glob", "serde", "serde_derive", "serde_json", + "target-triple", "termcolor", "toml 0.8.19", ] @@ -3688,9 +3695,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3699,9 +3706,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -3714,9 +3721,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3726,9 +3733,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3736,9 +3743,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -3749,15 +3756,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-bindgen-test" -version = "0.3.43" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" +checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" dependencies = [ "console_error_panic_hook", "js-sys", @@ -3770,9 +3777,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.43" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" +checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 008d2eb3a2..e7f522906c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ exclude = [ [workspace.package] edition = "2021" version = "0.19.0" -rust-version = "1.80.0" +rust-version = "1.82.0" authors = ["boa-dev"] repository = "https://github.com/boa-dev/boa" license = "Unlicense OR MIT" @@ -48,7 +48,7 @@ boa_string = { version = "~0.19.0", path = "core/string" } # Shared deps arbitrary = "1" bitflags = "2.5.0" -clap = "4.5.19" +clap = "4.5.20" colored = "2.1.0" fast-float = "0.2.0" hashbrown = { version = "0.14.5", default-features = false } @@ -63,7 +63,7 @@ pollster = "0.3.0" regex = "1.11.0" regress = { version = "0.10.1", features = ["utf16"] } rustc-hash = { version = "2.0.0", default-features = false } -serde_json = "1.0.128" +serde_json = "1.0.132" serde = "1.0.210" static_assertions = "1.1.0" textwrap = "0.16.0" @@ -73,24 +73,24 @@ tinystr = "0.7.5" log = "0.4.22" simple_logger = "5.0.0" cargo_metadata = "0.18.1" -trybuild = "1.0.99" +trybuild = "1.0.101" rayon = "1.10.0" toml = "0.8.19" color-eyre = "0.6.3" comfy-table = "7.1.1" serde_repr = "0.1.19" bus = "2.4.1" -wasm-bindgen = { version = "0.2.93", default-features = false } +wasm-bindgen = { version = "0.2.95", default-features = false } getrandom = { version = "0.2.15", default-features = false } console_error_panic_hook = "0.1.7" -wasm-bindgen-test = "0.3.43" +wasm-bindgen-test = "0.3.45" smol = "2.0.2" futures-util = "0.3.31" isahc = "1.7.2" rustyline = { version = "14.0.0", default-features = false } dhat = "0.3.3" quote = "1.0.37" -syn = { version = "2.0.79", default-features = false } +syn = { version = "2.0.82", default-features = false } proc-macro2 = "1.0" synstructure = "0.13" measureme = "11.0.1" @@ -105,7 +105,7 @@ dashmap = "5.5.3" num_enum = "0.7.3" itertools = { version = "0.13.0", default-features = false } portable-atomic = "1.9.0" -bytemuck = { version = "1.18.0", default-features = false } +bytemuck = { version = "1.19.0", default-features = false } arrayvec = "0.7.6" intrusive-collections = "0.9.7" cfg-if = "1.0.0" diff --git a/core/parser/src/lexer/number.rs b/core/parser/src/lexer/number.rs index 9fa7475ec5..c944eb878b 100644 --- a/core/parser/src/lexer/number.rs +++ b/core/parser/src/lexer/number.rs @@ -367,18 +367,15 @@ impl Tokenizer for NumberLiteral { // The non-digit character at this point must be an 'e' or 'E' to indicate an Exponent Part. // Another '.' or 'n' is not allowed. - match cursor.peek_char()? { - Some(0x0065 /*e */ | 0x0045 /* E */) => { - // Consume the ExponentIndicator. - cursor.next_char()?.expect("e or E token vanished"); + if let Some(0x0065 /*e */ | 0x0045 /* E */) = cursor.peek_char()? { + // Consume the ExponentIndicator. + cursor.next_char()?.expect("e or E token vanished"); - buf.push(b'E'); + buf.push(b'E'); - take_signed_integer(&mut buf, cursor, kind)?; - } - Some(_) | None => { - // Finished lexing. - } + take_signed_integer(&mut buf, cursor, kind)?; + } else { + // Finished lexing. } } } diff --git a/ffi/wasm/Cargo.toml b/ffi/wasm/Cargo.toml index ec2c2c23a0..d8f6575057 100644 --- a/ffi/wasm/Cargo.toml +++ b/ffi/wasm/Cargo.toml @@ -17,7 +17,7 @@ wasm-bindgen = { workspace = true, default-features = false } getrandom = { workspace = true, features = ["js"] } console_error_panic_hook.workspace = true -[dev-dependencies] +[target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dev-dependencies] wasm-bindgen-test.workspace = true [features] diff --git a/ffi/wasm/tests/web.rs b/ffi/wasm/tests/web.rs index b04bfb90e4..d3ea23b9f4 100644 --- a/ffi/wasm/tests/web.rs +++ b/ffi/wasm/tests/web.rs @@ -1,4 +1,12 @@ -#![allow(unused_crate_dependencies)] +#![expect( + unused_crate_dependencies, + reason = "https://github.com/rust-lang/rust/issues/95513" +)] +#![cfg(all( + any(target_arch = "wasm32", target_arch = "wasm64"), + target_os = "unknown" +))] + use wasm_bindgen_test::*; wasm_bindgen_test_configure!(run_in_browser);