Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
508 changes: 256 additions & 252 deletions Cargo.lock

Large diffs are not rendered by default.

64 changes: 33 additions & 31 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fast-float2 = "0.2.3"
hashbrown = "0.16.1"
http = { version = "1.4.0" }
iana-time-zone = "0.1.65"
indexmap = { version = "2.13.0", default-features = false }
indexmap = { version = "2.13.1", default-features = false }
indoc = "2.0.7"
itoa = "1.0.18"
jemallocator = "0.5.4"
Expand All @@ -74,10 +74,10 @@ oneshot = "0.2.1"
phf = { version = "0.13.1", default-features = false }
pollster = "0.4.0"
regex = "1.12.3"
regress = { version = "0.11.0", features = ["utf16"] }
regress = { version = "0.11.1", features = ["utf16"] }
reqwest = { version = "0.13.2", default-features = false, features = ["rustls-no-provider"] }
rustls = { version = "0.23.37", default-features = false, features = ["ring"] }
rustc-hash = { version = "2.1.1", default-features = false }
rustc-hash = { version = "2.1.2", default-features = false }
serde_json = "1.0.149"
serde = "1.0.219"
static_assertions = "1.1.0"
Expand All @@ -95,7 +95,7 @@ simple_logger = "5.1.0"
cargo_metadata = "0.23.1"
trybuild = "1.0.116"
rayon = "1.10.0"
toml = "1.1.0"
toml = "1.1.2"
color-eyre = "0.6.3"
comfy-table = "7.2.2"
serde_repr = "0.1.20"
Expand Down Expand Up @@ -128,16 +128,16 @@ intrusive-collections = "0.10.0"
cfg-if = "1.0.4"
either = "1.15.0"
sys-locale = "0.3.2"
timezone_provider = { version = "0.2.0" }
temporal_rs = { version = "0.2.0", default-features = false, features = ["float64_representable_durations"] }
timezone_provider = { version = "0.2.3" }
temporal_rs = { version = "0.2.3", default-features = false, features = ["float64_representable_durations"] }
web-time = "1.1.0"
criterion = "0.8.1"
float-cmp = "0.10.0"
futures-lite = "2.6.1"
test-case = "3.3.1"
rstest = "0.26.1"
url = "2.5.8"
tokio = { version = "1.50.0", default-features = false }
tokio = { version = "1.51.0", default-features = false }
futures-concurrency = "7.7.1"
dynify = "0.1.2"
futures-channel = "0.3.32"
Expand All @@ -148,31 +148,33 @@ unsend = { version = "0.2.1", default-features = false }
husky-rs = "0.3.2"
async-channel = "2.5.0"

# ICU4X
# ICU4X core

icu_provider = { version = "~2.1.1", default-features = false }
icu_locale = { version = "~2.1.1", default-features = false }
icu_locale_core = { version = "~2.1.1", default-features = false }
icu_datetime = { version = "~2.1.1", default-features = false }
icu_time = { version = "~2.1.1", default-features = false }
icu_calendar = { version = "~2.1.1", default-features = false }
icu_collator = { version = "~2.1.1", default-features = false }
icu_plurals = { version = "~2.1.1", default-features = false }
icu_list = { version = "~2.1.1", default-features = false }
icu_casemap = { version = "~2.1.1", default-features = false }
icu_segmenter = { version = "~2.1.2", default-features = false }
icu_provider_export = { version = "~2.1.1", default-features = false }
icu_provider_source = { version = "~2.1.2", default-features = false }
icu_provider_adapters = { version = "~2.1.1", default-features = false }
icu_provider_blob = { version = "~2.1.1", default-features = false }
icu_properties = { version = "~2.1.2", default-features = true }
icu_normalizer = { version = "~2.1.1", default-features = false }
icu_decimal = { version = "~2.1.1", default-features = false }
writeable = "~0.6.2"
tinystr = "~0.8.2"
yoke = "~0.8.1"
zerofrom = "~0.1.6"
fixed_decimal = "~0.7.1"
icu_provider = { version = "2.2.0", default-features = false }
icu_locale_core = { version = "2.2.0", default-features = false }

# ICU4X component
icu_locale = { version = "~2.2.0", default-features = false }
icu_datetime = { version = "~2.2.0", default-features = false }
icu_time = { version = "~2.2.0", default-features = false }
icu_calendar = { version = "~2.2.1", default-features = false }
icu_collator = { version = "~2.2.0", default-features = false }
icu_plurals = { version = "~2.2.0", default-features = false }
icu_list = { version = "~2.2.0", default-features = false }
icu_casemap = { version = "~2.2.0", default-features = false }
icu_segmenter = { version = "~2.2.0", default-features = false }
icu_provider_export = { version = "~2.2.0", default-features = false }
icu_provider_source = { version = "~2.2.0", default-features = false }
icu_provider_adapters = { version = "~2.2.0", default-features = false }
icu_provider_blob = { version = "~2.2.0", default-features = false }
icu_properties = { version = "~2.2.0", default-features = true }
icu_normalizer = { version = "~2.2.0", default-features = false }
icu_decimal = { version = "~2.2.0", default-features = false }
writeable = "0.6.2"
tinystr = "0.8.2"
yoke = "0.8.1"
zerofrom = "0.1.7"
fixed_decimal = "0.7.2"

[workspace.metadata.workspaces]
allow_branch = "main"
Expand Down
2 changes: 1 addition & 1 deletion core/engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ icu_collator = { workspace = true, default-features = false, features = [
], optional = true }
icu_plurals = { workspace = true, default-features = false, features = [
"serde",
"experimental",
"unstable",
], optional = true }
icu_list = { workspace = true, default-features = false, features = [
"serde",
Expand Down
2 changes: 1 addition & 1 deletion core/engine/src/builtins/intl/date_time_format/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ fn format_timestamp_with_dtf(
let fields = ToLocalTime::from_local_epoch_milliseconds(tz)?;
let dt = fields.to_formattable_datetime()?;
let tz_info = time_zone.to_time_zone_info();
let tz_info_at_time = tz_info.at_date_time_iso(dt);
let tz_info_at_time = tz_info.at_date_time(dt);
let zdt = ZonedDateTime {
date: dt.date,
time: dt.time,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ fn has_calendar_data_for_locale<C: CldrCalendar>(
where
IntlProvider: DryDataProvider<C::YearNamesV1>,
{
use icu_datetime::provider::neo::marker_attrs;
use icu_datetime::provider::semantic_skeletons::marker_attrs;
use icu_provider::prelude::{
DataIdentifierBorrowed, DataRequest, DataRequestMetadata,
icu_locale_core::preferences::LocalePreferences,
Expand Down
15 changes: 12 additions & 3 deletions core/engine/src/builtins/intl/number_format/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::cell::Cell;

use boa_gc::{Finalize, Trace};
use boa_gc::{Finalize, Trace, custom_trace};
use fixed_decimal::{Decimal, FloatPrecision, SignDisplay};
use icu_decimal::{
DecimalFormatter, DecimalFormatterPreferences, FormattedDecimal,
Expand Down Expand Up @@ -44,9 +44,8 @@ use crate::{js_error, value::JsVariant};
#[cfg(test)]
mod tests;

#[derive(Debug, Trace, Finalize, JsData)]
#[derive(Debug, Finalize, JsData)]
// Safety: `NumberFormat` only contains non-traceable types.
#[boa_gc(unsafe_empty_trace)]
pub(crate) struct NumberFormat {
locale: Locale,
formatter: DecimalFormatter,
Expand All @@ -59,6 +58,16 @@ pub(crate) struct NumberFormat {
bound_format: Option<JsFunction>,
}

// SAFETY: the implementation correctly traces the only field
// that needs tracing.
unsafe impl Trace for NumberFormat {
custom_trace!(this, mark, {
if let Some(f) = &this.bound_format {
mark(f);
}
});
}

impl NumberFormat {
/// [`FormatNumeric ( numberFormat, x )`][full] and [`FormatNumericToParts ( numberFormat, x )`][parts].
///
Expand Down
2 changes: 1 addition & 1 deletion core/icu_provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ icu_decimal = { workspace = true, features = ["serde", "datagen"] }
icu_list = { workspace = true, features = ["serde", "datagen"] }
icu_locale = { workspace = true, features = ["serde", "datagen"] }
icu_normalizer = { workspace = true, features = ["serde", "datagen"] }
icu_plurals = { workspace = true, features = ["serde", "datagen", "experimental"] }
icu_plurals = { workspace = true, features = ["serde", "datagen", "unstable"] }
icu_segmenter = { workspace = true, features = ["serde", "datagen"] }
once_cell = { workspace = true, default-features = false, features = ["critical-section"] }
paste.workspace = true
Expand Down
Binary file modified core/icu_provider/data/icu_collator.postcard
Binary file not shown.
Binary file modified core/icu_provider/data/icu_datetime.postcard
Binary file not shown.
Binary file modified core/icu_provider/data/icu_decimal.postcard
Binary file not shown.
Binary file modified core/icu_provider/data/icu_locale.postcard
Binary file not shown.
Binary file modified core/icu_provider/data/icu_normalizer.postcard
Binary file not shown.
Binary file modified core/icu_provider/data/icu_segmenter.postcard
Binary file not shown.
Binary file modified core/icu_provider/data/icu_time.postcard
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/insta-bytecode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ edition.workspace = true
boa_engine = { workspace = true }

[dev-dependencies]
insta = { version = "1.47.0", features = ["filters", "glob"] }
insta = { version = "1.47.2", features = ["filters", "glob"] }
6 changes: 3 additions & 3 deletions tools/gen-icu4x-data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ icu_provider_export = { workspace = true, features = [
icu_provider_source = { workspace = true, features = [
"networking",
"use_wasm",
"experimental"
"unstable"
] }
log.workspace = true
simple_logger.workspace = true
Expand All @@ -28,11 +28,11 @@ icu_casemap = { workspace = true, features = ["datagen"] }
icu_collator = { workspace = true, features = ["datagen"] }
icu_datetime = { workspace = true, features = ["datagen"] }
icu_time = { workspace = true, features = ["datagen"] }
icu_decimal = { workspace = true, features = ["datagen"] }
icu_decimal = { workspace = true, features = ["datagen", "unstable"] }
icu_list = { workspace = true, features = ["datagen"] }
icu_locale = { workspace = true, features = ["datagen"] }
icu_normalizer = { workspace = true, features = ["datagen"] }
icu_plurals = { workspace = true, features = ["datagen", "experimental"] }
icu_plurals = { workspace = true, features = ["datagen", "unstable"] }
icu_segmenter = { workspace = true, features = ["datagen"] }

[lints]
Expand Down
Loading