Skip to content

Commit a3ed91b

Browse files
authored
Merge branch 'main' into feat/5083-plainyearmonth-tolocalestring
2 parents a1db048 + 3ee2b71 commit a3ed91b

23 files changed

Lines changed: 238 additions & 157 deletions

File tree

Cargo.lock

Lines changed: 31 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ small_btree = { version = "~0.1.0", path = "utils/small_btree" }
5353
# Shared deps
5454
arbitrary = "1"
5555
base64 = "0.22.1"
56-
bitflags = "2.11.0"
56+
bitflags = "2.11.1"
5757
clap = "4.5.59"
5858
colored = "3.1.1"
5959
cow-utils = "0.1.3"
6060
fast-float2 = "0.2.3"
61-
hashbrown = "0.16.1"
61+
hashbrown = "0.17.0"
6262
http = { version = "1.4.0" }
6363
iana-time-zone = "0.1.65"
64-
indexmap = { version = "2.13.1", default-features = false }
64+
indexmap = { version = "2.14.0", default-features = false }
6565
indoc = "2.0.7"
6666
itoa = "1.0.18"
6767
jemallocator = "0.5.4"
@@ -76,13 +76,13 @@ pollster = "0.4.0"
7676
regex = "1.12.3"
7777
regress = { version = "0.11.1", features = ["utf16"] }
7878
reqwest = { version = "0.13.2", default-features = false, features = ["rustls-no-provider"] }
79-
rustls = { version = "0.23.37", default-features = false, features = ["ring"] }
79+
rustls = { version = "0.23.38", default-features = false, features = ["ring"] }
8080
rustc-hash = { version = "2.1.2", default-features = false }
8181
serde_json = "1.0.149"
8282
serde = "1.0.219"
8383
static_assertions = "1.1.0"
8484
textwrap = "0.16.2"
85-
thin-vec = "0.2.14"
85+
thin-vec = "0.2.16"
8686
time = { version = "0.3.47", default-features = false, features = [
8787
"local-offset",
8888
"large-dates",
@@ -94,7 +94,7 @@ log = "0.4.29"
9494
simple_logger = "5.1.0"
9595
cargo_metadata = "0.23.1"
9696
trybuild = "1.0.116"
97-
rayon = "1.10.0"
97+
rayon = "1.12.0"
9898
toml = "1.1.2"
9999
color-eyre = "0.6.3"
100100
comfy-table = "7.2.2"
@@ -113,7 +113,7 @@ proc-macro2 = "1.0"
113113
synstructure = "0.13"
114114
measureme = "12.0.3"
115115
pastey = "0.2.1"
116-
rand = "0.10.0"
116+
rand = "0.10.1"
117117
num-integer = "0.1.46"
118118
ryu-js = "1.0.2"
119119
tap = "1.0.1"
@@ -137,7 +137,7 @@ futures-lite = "2.6.1"
137137
test-case = "3.3.1"
138138
rstest = "0.26.1"
139139
url = "2.5.8"
140-
tokio = { version = "1.51.0", default-features = false }
140+
tokio = { version = "1.51.1", default-features = false }
141141
futures-concurrency = "7.7.1"
142142
dynify = "0.1.2"
143143
futures-channel = "0.3.32"

core/ast/src/scope.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -734,8 +734,8 @@ impl FunctionScopes {
734734
.bindings
735735
.borrow()
736736
.first()
737-
.filter(|b| b.name == "arguments" && b.is_accessed())
738-
.is_some()
737+
.as_ref()
738+
.is_some_and(|b| b.name == "arguments" && b.is_accessed())
739739
{
740740
return true;
741741
}
@@ -746,8 +746,8 @@ impl FunctionScopes {
746746
.bindings
747747
.borrow()
748748
.first()
749-
.filter(|b| b.name == "arguments" && b.is_accessed())
750-
.is_some()
749+
.as_ref()
750+
.is_some_and(|b| b.name == "arguments" && b.is_accessed())
751751
{
752752
return true;
753753
}

core/engine/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ icu_segmenter = { workspace = true, default-features = false, features = [
176176
"serde",
177177
], optional = true }
178178
icu_decimal = { workspace = true, default-features = false, features = [
179-
"serde",
179+
"serde", "unstable"
180180
], optional = true }
181181
writeable = { workspace = true, optional = true }
182182
yoke = { workspace = true, optional = true }

core/engine/src/builtins/bigint/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ impl BigInt {
224224
) -> JsResult<JsValue> {
225225
#[cfg(feature = "intl")]
226226
{
227-
// 1. Let x be ? ThisBigIntValue(this value).
228-
227+
use crate::builtins::intl::NumberFormat;
229228
use fixed_decimal::Decimal;
229+
use writeable::Writeable;
230230

231-
use crate::builtins::intl::NumberFormat;
231+
// 1. Let x be ? ThisBigIntValue(this value).
232232
let x = Self::this_bigint_value(this)?;
233233
let locales = args.get_or_undefined(0).clone();
234234
let options = args.get_or_undefined(1).clone();
@@ -239,7 +239,7 @@ impl BigInt {
239239
.map_err(|err| JsNativeError::range().with_message(err.to_string()))?;
240240

241241
// 3. Return FormatNumeric(numberFormat, ℝ(x)).
242-
Ok(js_string!(number_format.format(x).to_string()).into())
242+
Ok(js_string!(number_format.format(x).write_to_string()).into())
243243
}
244244

245245
#[cfg(not(feature = "intl"))]

core/engine/src/builtins/dataview/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ impl DataView {
416416
// 5. If IsViewOutOfBounds(viewRecord) is true, throw a TypeError exception.
417417
if buffer
418418
.bytes(Ordering::SeqCst)
419-
.filter(|b| !view.is_out_of_bounds(b.len()))
420-
.is_none()
419+
.as_ref()
420+
.is_none_or(|b| view.is_out_of_bounds(b.len()))
421421
{
422422
return Err(JsNativeError::typ()
423423
.with_message("data view is outside the bounds of its inner buffer")

core/engine/src/builtins/escape/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,8 @@ fn unescape(_: &JsValue, args: &[JsValue], context: &mut Context) -> JsResult<Js
129129
// 2. Let len be the length of string.
130130
// 4. Let k be 0.
131131
// 5. Repeat, while k < len,
132-
loop {
133-
// a. Let C be the code unit at index k within string.
134-
let Some(cp) = codepoints.next() else {
135-
break;
136-
};
137-
132+
// a. Let C be the code unit at index k within string.
133+
while let Some(cp) = codepoints.next() {
138134
// b. If C is the code unit 0x0025 (PERCENT SIGN), then
139135
if cp != u16::from(b'%') {
140136
vec.push(cp);

0 commit comments

Comments
 (0)