From 26681a0e2c4aeb527e7897ee8003a4c8b55dd007 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 21:02:32 +0100 Subject: [PATCH] Bump the rust-dependencies group across 1 directory with 6 updates (#4061) * Bump the rust-dependencies group across 1 directory with 6 updates Bumps the rust-dependencies group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [indexmap](https://github.com/indexmap-rs/indexmap) | `2.6.0` | `2.7.0` | | [rustc-hash](https://github.com/rust-lang/rustc-hash) | `2.0.0` | `2.1.0` | | [time](https://github.com/time-rs/time) | `0.3.36` | `0.3.37` | | [wasm-bindgen](https://github.com/rustwasm/wasm-bindgen) | `0.2.95` | `0.2.97` | | [wasm-bindgen-test](https://github.com/rustwasm/wasm-bindgen) | `0.3.45` | `0.3.47` | | [syn](https://github.com/dtolnay/syn) | `2.0.89` | `2.0.90` | Updates `indexmap` from 2.6.0 to 2.7.0 - [Changelog](https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md) - [Commits](https://github.com/indexmap-rs/indexmap/compare/2.6.0...2.7.0) Updates `rustc-hash` from 2.0.0 to 2.1.0 - [Changelog](https://github.com/rust-lang/rustc-hash/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/rustc-hash/compare/v2.0.0...v2.1.0) Updates `time` from 0.3.36 to 0.3.37 - [Release notes](https://github.com/time-rs/time/releases) - [Changelog](https://github.com/time-rs/time/blob/main/CHANGELOG.md) - [Commits](https://github.com/time-rs/time/compare/v0.3.36...v0.3.37) Updates `wasm-bindgen` from 0.2.95 to 0.2.97 - [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.95...0.2.97) Updates `wasm-bindgen-test` from 0.3.45 to 0.3.47 - [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.89 to 2.0.90 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.89...2.0.90) --- updated-dependencies: - dependency-name: indexmap dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: rustc-hash dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: time 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 ... Signed-off-by: dependabot[bot] * Remove `time` sondness workarounds for tests * fix lockfile --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: raskad <32105367+raskad@users.noreply.github.com> --- Cargo.lock | 85 +++++++++++++------------- Cargo.toml | 12 ++-- core/engine/src/builtins/date/tests.rs | 9 +-- core/engine/src/context/hooks.rs | 10 --- tests/tester/Cargo.toml | 1 - tests/tester/src/main.rs | 6 -- 6 files changed, 50 insertions(+), 73 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 638f0524b0..fb353c822b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -323,7 +323,7 @@ dependencies = [ "boa_string", "indexmap", "num-bigint", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", ] @@ -396,7 +396,7 @@ dependencies = [ "portable-atomic", "rand", "regress", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "ryu-js", "serde", "serde_json", @@ -476,7 +476,7 @@ dependencies = [ "indexmap", "once_cell", "phf", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "static_assertions", ] @@ -488,7 +488,7 @@ dependencies = [ "boa_engine", "boa_gc", "boa_macros", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", ] [[package]] @@ -523,7 +523,7 @@ dependencies = [ "num-bigint", "num-traits", "regress", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", ] [[package]] @@ -532,7 +532,7 @@ version = "0.19.0" dependencies = [ "measureme", "once_cell", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", ] [[package]] @@ -543,7 +543,7 @@ dependencies = [ "boa_gc", "boa_interop", "indoc", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "textwrap", "url", ] @@ -554,7 +554,7 @@ version = "0.19.0" dependencies = [ "fast-float2", "paste", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "sptr", "static_assertions", ] @@ -574,12 +574,11 @@ dependencies = [ "comfy-table", "phf", "rayon", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "serde_json", "serde_repr", "serde_yaml", - "time", "toml 0.8.19", ] @@ -1977,9 +1976,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -2114,10 +2113,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2865,9 +2865,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustix" @@ -3248,9 +3248,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -3299,7 +3299,7 @@ dependencies = [ "ixdtf", "num-bigint", "num-traits", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "tinystr", ] @@ -3420,9 +3420,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -3444,9 +3444,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -3736,9 +3736,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", "once_cell", @@ -3747,9 +3747,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", @@ -3762,21 +3762,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3784,9 +3785,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", @@ -3797,19 +3798,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "wasm-bindgen-test" -version = "0.3.45" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" +checksum = "3d919bb60ebcecb9160afee6c71b43a58a4f0517a2de0054cd050d02cec08201" dependencies = [ - "console_error_panic_hook", "js-sys", "minicov", + "once_cell", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -3818,9 +3819,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.45" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" +checksum = "222ebde6ea87fbfa6bdd2e9f1fd8a91d60aee5db68792632176c4e16a74fc7d8" dependencies = [ "proc-macro2", "quote", @@ -3869,9 +3870,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index bdcd485ab9..21a34ab6dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ clap = "4.5.21" colored = "2.1.0" fast-float2 = "0.2.3" hashbrown = "0.15.2" -indexmap = { version = "2.6.0", default-features = false } +indexmap = { version = "2.7.0", default-features = false } indoc = "2.0.5" jemallocator = "0.5.4" num-bigint = "0.4.6" @@ -62,13 +62,13 @@ phf = { version = "0.11.2", default-features = false } pollster = "0.4.0" regex = "1.11.1" regress = { version = "0.10.1", features = ["utf16"] } -rustc-hash = { version = "2.0.0", default-features = false } +rustc-hash = { version = "2.1.0", default-features = false } serde_json = "1.0.133" serde = "1.0.215" static_assertions = "1.1.0" textwrap = "0.16.0" thin-vec = "0.2.13" -time = { version = "0.3.36", default-features = false, features = ["local-offset", "large-dates", "wasm-bindgen", "parsing", "formatting", "macros"] } +time = { version = "0.3.37", default-features = false, features = ["local-offset", "large-dates", "wasm-bindgen", "parsing", "formatting", "macros"] } tinystr = "0.7.5" log = "0.4.22" simple_logger = "5.0.0" @@ -80,17 +80,17 @@ color-eyre = "0.6.3" comfy-table = "7.1.3" serde_repr = "0.1.19" bus = "2.4.1" -wasm-bindgen = { version = "0.2.95", default-features = false } +wasm-bindgen = { version = "0.2.97", default-features = false } getrandom = { version = "0.2.15", default-features = false } console_error_panic_hook = "0.1.7" -wasm-bindgen-test = "0.3.45" +wasm-bindgen-test = "0.3.47" smol = "2.0.2" futures-util = "0.3.31" isahc = "1.7.2" rustyline = { version = "15.0.0", default-features = false } dhat = "0.3.3" quote = "1.0.37" -syn = { version = "2.0.89", default-features = false } +syn = { version = "2.0.90", default-features = false } proc-macro2 = "1.0" synstructure = "0.13" measureme = "12.0.0" diff --git a/core/engine/src/builtins/date/tests.rs b/core/engine/src/builtins/date/tests.rs index 7950722408..7cd287352d 100644 --- a/core/engine/src/builtins/date/tests.rs +++ b/core/engine/src/builtins/date/tests.rs @@ -1,7 +1,7 @@ use crate::{js_string, run_test_actions, JsNativeErrorKind, TestAction}; use boa_macros::js_str; use indoc::indoc; -use time::{macros::format_description, util::local_offset, OffsetDateTime}; +use time::{macros::format_description, OffsetDateTime}; // NOTE: Javascript Uses 0-based months, where time uses 1-based months. // Many of the assertions look wrong because of this. @@ -33,13 +33,6 @@ fn from_local( second: u8, millisecond: u16, ) -> OffsetDateTime { - // Safety: This is needed during tests because cargo is running tests in multiple threads. - // It is safe because tests do not modify the environment. - #[cfg(test)] - unsafe { - local_offset::set_soundness(local_offset::Soundness::Unsound); - } - let t = time::Date::from_calendar_date(year, month_from_u8(month), date) .unwrap() .with_hms_milli(hour, minute, second, millisecond) diff --git a/core/engine/src/context/hooks.rs b/core/engine/src/context/hooks.rs index be477e4d98..e30b8ea39e 100644 --- a/core/engine/src/context/hooks.rs +++ b/core/engine/src/context/hooks.rs @@ -8,9 +8,6 @@ use crate::{ }; use time::{OffsetDateTime, UtcOffset}; -#[cfg(test)] -use time::util::local_offset; - /// [`Host Hooks`] customizable by the host code or engine. /// /// Every hook contains on its `Requirements` section the spec requirements @@ -191,13 +188,6 @@ pub trait HostHooks { /// Returns the offset of the local timezone to the `utc` timezone in seconds. fn local_timezone_offset_seconds(&self, unix_time_seconds: i64) -> i32 { - // Safety: This is needed during tests because cargo is running tests in multiple threads. - // It is safe because tests do not modify the environment. - #[cfg(test)] - unsafe { - local_offset::set_soundness(local_offset::Soundness::Unsound); - } - OffsetDateTime::from_unix_timestamp(unix_time_seconds) .ok() .and_then(|t| UtcOffset::local_offset_at(t).ok()) diff --git a/tests/tester/Cargo.toml b/tests/tester/Cargo.toml index 0216531282..f2e5f165df 100644 --- a/tests/tester/Cargo.toml +++ b/tests/tester/Cargo.toml @@ -29,7 +29,6 @@ phf = { workspace = true, features = ["macros"] } comfy-table.workspace = true serde_repr.workspace = true bus.workspace = true -time.workspace = true [features] default = ["boa_engine/intl_bundled", "boa_engine/experimental", "boa_engine/annex-b"] diff --git a/tests/tester/src/main.rs b/tests/tester/src/main.rs index bc2b862483..8b35af0fb6 100644 --- a/tests/tester/src/main.rs +++ b/tests/tester/src/main.rs @@ -193,12 +193,6 @@ const DEFAULT_TEST262_DIRECTORY: &str = "test262"; fn main() -> Result<()> { color_eyre::install()?; - // Safety: This is needed because we run tests in multiple threads. - // It is safe because tests do not modify the environment. - unsafe { - time::util::local_offset::set_soundness(time::util::local_offset::Soundness::Unsound); - } - // initializes the monotonic clock. START .set(Instant::now())