From 81d50e1b6685a12a4f43693e695073a97f79264b Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 13 Sep 2023 16:01:31 -0600 Subject: [PATCH] chore: bump deno_core and cargo update (#20480) Bump deno_core, pulling in new rusty_v8. Requires some op2/deprecation fixes. --- Cargo.lock | 435 +++++++++++++++++++------------------ Cargo.toml | 2 +- ext/fs/ops.rs | 12 +- ext/http/slab.rs | 4 +- ext/net/ops.rs | 4 +- ext/node/ops/zlib/mod.rs | 4 +- ext/websocket/lib.rs | 4 +- runtime/ops/process.rs | 15 +- runtime/ops/signal.rs | 13 +- tools/wpt/expectation.json | 175 +-------------- 10 files changed, 257 insertions(+), 411 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca0f04048b..2cbcf1368d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -158,9 +158,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -215,7 +215,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.27", + "time 0.3.28", ] [[package]] @@ -224,7 +224,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", "synstructure", @@ -236,7 +236,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -248,17 +248,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" dependencies = [ "brotli", "flate2", @@ -285,9 +285,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -296,9 +296,9 @@ version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -308,7 +308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -320,7 +320,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -372,9 +372,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64-simd" @@ -496,9 +496,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cache_control" @@ -734,9 +734,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", @@ -779,9 +779,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" dependencies = [ "cfg-if", "cpufeatures", @@ -799,16 +799,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] name = "dashmap" -version = "5.5.1" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", "hashbrown 0.14.0", @@ -890,7 +890,7 @@ dependencies = [ "indexmap 2.0.0", "jsonc-parser", "junction", - "lazy-regex 3.0.1", + "lazy-regex", "libc", "log", "lsp-types", @@ -940,8 +940,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" dependencies = [ "deno-proc-macro-rules-macros", - "proc-macro2 1.0.66", - "syn 2.0.29", + "proc-macro2 1.0.67", + "syn 2.0.33", ] [[package]] @@ -951,9 +951,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435" dependencies = [ "once_cell", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -1074,16 +1074,16 @@ dependencies = [ [[package]] name = "deno_core" -version = "0.209.0" +version = "0.210.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48ff1f83aeeda4b8ed9c101b85380fd2f25a52268130546c610c8e412911d7b" +checksum = "1abaede1f57501d6c92075d678f522aea22794b82523e67db8130ca1a6a1cb5d" dependencies = [ "anyhow", "bytes", "deno_ops", "deno_unsync", "futures", - "indexmap 1.9.3", + "indexmap 2.0.0", "libc", "log", "once_cell", @@ -1093,7 +1093,7 @@ dependencies = [ "serde_json", "serde_v8", "smallvec", - "sourcemap", + "sourcemap 7.0.0", "tokio", "url", "v8", @@ -1374,7 +1374,7 @@ dependencies = [ "log", "pin-project", "serde", - "socket2 0.5.3", + "socket2 0.5.4", "tokio", "trust-dns-proto", "trust-dns-resolver", @@ -1404,7 +1404,7 @@ dependencies = [ "hkdf", "idna 0.3.0", "indexmap 2.0.0", - "lazy-regex 3.0.1", + "lazy-regex", "libc", "libz-sys", "md-5", @@ -1458,21 +1458,21 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.87.0" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573a5ae66f76ce159525ab9007433e19d1a074e32c27b17a4753780d659d79fa" +checksum = "cefc6c32ef8b4c701d6d5aee05f92cdf3b252e209db860bccb7da47043cccac0" dependencies = [ "deno-proc-macro-rules", - "lazy-regex 2.5.0", + "lazy-regex", "once_cell", "pmutil", "proc-macro-crate", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "regex", "strum", "strum_macros", - "syn 2.0.29", + "syn 2.0.33", "thiserror", ] @@ -1699,7 +1699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "rustc_version 0.4.0", "syn 1.0.109", @@ -1738,9 +1738,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -1874,7 +1874,7 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -1960,7 +1960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.2", + "crypto-bigint 0.5.3", "digest 0.10.7", "ff 0.13.0", "generic-array 0.14.7", @@ -1996,7 +1996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -2033,9 +2033,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -2078,7 +2078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4baf8c2353535c8ba042249c73b80d289c2ea82cd1eee4838560fa96b77dc392" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.4", "deno_ast", "deno_graph", "deno_npm", @@ -2126,7 +2126,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6185b6dc9dddc4db0dedd2e213047e93bcbf7a0fb092abc4c4e4f3195efdb4" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "hyper 0.14.27", "pin-project", "rand", @@ -2170,9 +2170,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "filetime" @@ -2198,7 +2198,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cde5eb168cf5a056dd98f311cbfab7494c216394e4fb9eba0336827a8db93" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -2247,9 +2247,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -2336,9 +2336,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -2513,9 +2513,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ "hashbrown 0.14.0", ] @@ -2556,6 +2556,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + [[package]] name = "hostname" version = "0.3.1" @@ -2817,7 +2826,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.4", "widestring", "windows-sys", "winreg", @@ -2837,9 +2846,9 @@ checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -2927,48 +2936,25 @@ dependencies = [ [[package]] name = "lazy-regex" -version = "2.5.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4" +checksum = "e723bd417b2df60a0f6a2b6825f297ea04b245d4ba52b5a22cb679bdf58b05fa" dependencies = [ - "lazy-regex-proc_macros 2.4.1", + "lazy-regex-proc_macros", "once_cell", "regex", ] -[[package]] -name = "lazy-regex" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57451d19ad5e289ff6c3d69c2a2424652995c42b79dafa11e9c4d5508c913c01" -dependencies = [ - "lazy-regex-proc_macros 3.0.1", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex-proc_macros" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22" -dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "regex", - "syn 1.0.109", -] - [[package]] name = "lazy-regex-proc_macros" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "regex", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -2982,9 +2968,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libffi" @@ -3062,9 +3048,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -3139,9 +3125,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.2" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -3231,11 +3217,11 @@ dependencies = [ name = "napi_sym" version = "0.48.0" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "serde", "serde_json", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -3405,9 +3391,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3589,9 +3575,9 @@ checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" [[package]] name = "path-dedot" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d55e486337acb9973cdea3ec5638c1b3bcb22e573b2b7b41969e0c744d5a15e" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" dependencies = [ "once_cell", ] @@ -3676,7 +3662,7 @@ dependencies = [ "phf_generator", "phf_shared", "proc-macro-hack", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -3705,9 +3691,9 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -3762,9 +3748,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.0.2" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] name = "pmutil" @@ -3772,9 +3758,9 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -3817,7 +3803,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "syn 1.0.109", ] @@ -3847,7 +3833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", "version_check", @@ -3859,7 +3845,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "version_check", ] @@ -3881,9 +3867,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -3928,7 +3914,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -4006,7 +3992,7 @@ version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", ] [[package]] @@ -4084,9 +4070,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -4096,9 +4082,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -4107,9 +4093,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "relative-path" @@ -4124,7 +4110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "async-compression", - "base64 0.21.2", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -4291,12 +4277,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", - "errno 0.3.2", + "errno 0.3.3", "libc", "linux-raw-sys", "windows-sys", @@ -4304,9 +4290,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -4332,14 +4318,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" dependencies = [ "ring", "untrusted", @@ -4379,7 +4365,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "107c3d5d7f370ac09efa62a78375f94d94b8a33c61d8c278b96683fb4dbf2d8d" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -4544,9 +4530,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.187" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -4572,20 +4558,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.187" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "indexmap 2.0.0", "itoa", @@ -4599,9 +4585,9 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -4618,9 +4604,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.120.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5424b4b41a92222abf9ddbdd78f59164f7594422ee4a61fc3704fc8ba608dc6" +checksum = "cb2432ec29330973536a977aea8798fbef4e50cb0e72a8772877051039678bba" dependencies = [ "bytes", "derive_more", @@ -4750,9 +4736,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys", @@ -4774,6 +4760,22 @@ dependencies = [ "url", ] +[[package]] +name = "sourcemap" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbecc42a2b6131acc3bf9a25c9fe4161dba438eb52131bba83c5d781b5b70be3" +dependencies = [ + "data-encoding", + "debugid", + "if_chain", + "rustc_version 0.2.3", + "serde", + "serde_json", + "unicode-id", + "url", +] + [[package]] name = "spin" version = "0.5.2" @@ -4853,7 +4855,7 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator", "phf_shared", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", ] @@ -4864,10 +4866,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -4892,10 +4894,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" dependencies = [ "heck", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "rustversion", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -4965,7 +4967,7 @@ dependencies = [ "rustc-hash", "serde", "siphasher", - "sourcemap", + "sourcemap 6.4.1", "string_cache", "swc_atoms", "swc_eq_ignore_macros", @@ -4994,10 +4996,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5028,7 +5030,7 @@ dependencies = [ "once_cell", "rustc-hash", "serde", - "sourcemap", + "sourcemap 6.4.1", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -5043,10 +5045,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5138,10 +5140,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8188eab297da773836ef5cf2af03ee5cca7a563e1be4b146f8141452c28cc690" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5267,9 +5269,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5304,9 +5306,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" dependencies = [ "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5327,10 +5329,10 @@ checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5350,18 +5352,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.29" +version = "2.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "unicode-ident", ] @@ -5372,7 +5374,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", "unicode-xid 0.2.4", @@ -5441,7 +5443,7 @@ dependencies = [ "futures", "glob", "hyper 0.14.27", - "lazy-regex 3.0.1", + "lazy-regex", "libc", "lsp-types", "nix 0.26.2", @@ -5483,22 +5485,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5514,9 +5516,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -5533,9 +5535,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -5569,7 +5571,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys", ] @@ -5580,9 +5582,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5661,9 +5663,9 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "toml_datetime", @@ -5719,7 +5721,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebd99eec668d0a450c177acbc4d05e0d0d13b1f8d3db13cd706c52cbec4ac04" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -5748,9 +5750,9 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] @@ -5786,7 +5788,7 @@ dependencies = [ "radix_trie", "rand", "thiserror", - "time 0.3.27", + "time 0.3.28", "tokio", "tracing", "trust-dns-proto", @@ -5853,7 +5855,7 @@ dependencies = [ "futures-util", "serde", "thiserror", - "time 0.3.27", + "time 0.3.28", "tokio", "toml", "tracing", @@ -5948,15 +5950,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-id" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -6009,9 +6011,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", @@ -6056,9 +6058,9 @@ dependencies = [ [[package]] name = "v8" -version = "0.75.1" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e0cb10989bf856c2fdd1b6bed1bc6f96148230aa0c954634299125c1f64230" +checksum = "9d4e8ae7ef8b4e852e728e343cb6bb471a0424dfefa22585ea0c14a61252d73f" dependencies = [ "bitflags 1.3.2", "fslock", @@ -6101,7 +6103,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", ] @@ -6162,9 +6164,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", "wasm-bindgen-shared", ] @@ -6196,9 +6198,9 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6240,13 +6242,14 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -6405,7 +6408,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 4.0.0", + "curve25519-dalek 4.1.0", "rand_core 0.6.4", "serde", "zeroize", @@ -6425,7 +6428,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.27", + "time 0.3.28", ] [[package]] @@ -6458,9 +6461,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", "quote 1.0.33", - "syn 2.0.29", + "syn 2.0.33", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c5707de53a..595df1b879 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ repository = "https://github.com/denoland/deno" [workspace.dependencies] deno_ast = { version = "0.29.1", features = ["transpiling"] } -deno_core = { version = "0.209.0" } +deno_core = { version = "0.210.0" } deno_runtime = { version = "0.126.0", path = "./runtime" } napi_sym = { version = "0.48.0", path = "./cli/napi/sym" } diff --git a/ext/fs/ops.rs b/ext/fs/ops.rs index c98b214c28..15711e227d 100644 --- a/ext/fs/ops.rs +++ b/ext/fs/ops.rs @@ -1156,7 +1156,9 @@ where let res = fut.or_cancel(cancel_handle).await; if let Some(cancel_rid) = cancel_rid { - state.borrow_mut().resource_table.close(cancel_rid).ok(); + if let Ok(res) = state.borrow_mut().resource_table.take_any(cancel_rid) { + res.close(); + } }; res?.context_path("writefile", &path)?; @@ -1213,7 +1215,9 @@ where let res = fut.or_cancel(cancel_handle).await; if let Some(cancel_rid) = cancel_rid { - state.borrow_mut().resource_table.close(cancel_rid).ok(); + if let Ok(res) = state.borrow_mut().resource_table.take_any(cancel_rid) { + res.close(); + } }; res?.context_path("readfile", &path)? @@ -1269,7 +1273,9 @@ where let res = fut.or_cancel(cancel_handle).await; if let Some(cancel_rid) = cancel_rid { - state.borrow_mut().resource_table.close(cancel_rid).ok(); + if let Ok(res) = state.borrow_mut().resource_table.take_any(cancel_rid) { + res.close(); + } }; res?.context_path("readfile", &path)? diff --git a/ext/http/slab.rs b/ext/http/slab.rs index 4718aded1e..7c48b87b64 100644 --- a/ext/http/slab.rs +++ b/ext/http/slab.rs @@ -46,7 +46,9 @@ impl HttpRequestBodyAutocloser { impl Drop for HttpRequestBodyAutocloser { fn drop(&mut self) { - _ = self.1.borrow_mut().resource_table.close(self.0); + if let Ok(res) = self.1.borrow_mut().resource_table.take_any(self.0) { + res.close(); + } } } diff --git a/ext/net/ops.rs b/ext/net/ops.rs index b7459a347b..942afc55f5 100644 --- a/ext/net/ops.rs +++ b/ext/net/ops.rs @@ -621,7 +621,9 @@ where let lookup_rv = lookup_fut.or_cancel(cancel_handle).await; if let Some(cancel_rid) = cancel_rid { - state.borrow_mut().resource_table.close(cancel_rid).ok(); + if let Ok(res) = state.borrow_mut().resource_table.take_any(cancel_rid) { + res.close(); + } }; lookup_rv? diff --git a/ext/node/ops/zlib/mod.rs b/ext/node/ops/zlib/mod.rs index 2ddf6f2cd4..105666b06b 100644 --- a/ext/node/ops/zlib/mod.rs +++ b/ext/node/ops/zlib/mod.rs @@ -408,7 +408,9 @@ pub fn op_zlib_close_if_pending( }; if pending_close { drop(resource); - state.resource_table.close(handle)?; + if let Ok(res) = state.resource_table.take_any(handle) { + res.close(); + } } Ok(()) diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index 4b05131d9f..479cae7ecc 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -288,7 +288,9 @@ where }; if let Some(cancel_rid) = cancel_handle { - state.borrow_mut().resource_table.close(cancel_rid).ok(); + if let Ok(res) = state.borrow_mut().resource_table.take_any(cancel_rid) { + res.close(); + } } let mut state = state.borrow_mut(); diff --git a/runtime/ops/process.rs b/runtime/ops/process.rs index cef4f77f88..a5150950eb 100644 --- a/runtime/ops/process.rs +++ b/runtime/ops/process.rs @@ -5,7 +5,6 @@ use crate::permissions::PermissionsContainer; use deno_core::anyhow::Context; use deno_core::error::type_error; use deno_core::error::AnyError; -use deno_core::op; use deno_core::op2; use deno_core::serde_json; use deno_core::AsyncMutFuture; @@ -334,23 +333,21 @@ fn op_spawn_child( spawn_child(state, command) } -// TODO(bartlomieju): op2 doesn't support clippy allows -#[op] +#[op2(async)] #[allow(clippy::await_holding_refcell_ref)] +#[serde] async fn op_spawn_wait( state: Rc>, - rid: ResourceId, + #[smi] rid: ResourceId, ) -> Result { let resource = state .borrow_mut() .resource_table .get::(rid)?; let result = resource.0.try_borrow_mut()?.wait().await?.try_into(); - state - .borrow_mut() - .resource_table - .close(rid) - .expect("shouldn't have closed until now"); + if let Ok(resource) = state.borrow_mut().resource_table.take_any(rid) { + resource.close(); + } result } diff --git a/runtime/ops/signal.rs b/runtime/ops/signal.rs index 8508aa56a5..c0279a87c5 100644 --- a/runtime/ops/signal.rs +++ b/runtime/ops/signal.rs @@ -1,7 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use deno_core::error::type_error; use deno_core::error::AnyError; -use deno_core::op; use deno_core::op2; use deno_core::AsyncRefCell; use deno_core::CancelFuture; @@ -537,10 +536,11 @@ pub fn signal_int_to_str(s: libc::c_int) -> Result<&'static str, AnyError> { } #[cfg(unix)] -#[op] +#[op2(fast)] +#[smi] fn op_signal_bind( state: &mut OpState, - sig: &str, + #[string] sig: &str, ) -> Result { let signo = signal_str_to_int(sig)?; if signal_hook_registry::FORBIDDEN.contains(&signo) { @@ -557,10 +557,11 @@ fn op_signal_bind( } #[cfg(windows)] -#[op] +#[op2(fast)] +#[smi] fn op_signal_bind( state: &mut OpState, - sig: &str, + #[string] sig: &str, ) -> Result { let signo = signal_str_to_int(sig)?; let resource = SignalStreamResource { @@ -605,6 +606,6 @@ pub fn op_signal_unbind( state: &mut OpState, #[smi] rid: ResourceId, ) -> Result<(), AnyError> { - state.resource_table.close(rid)?; + state.resource_table.take_any(rid)?.close(); Ok(()) } diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json index f40fbac37d..f76e7266cb 100644 --- a/tools/wpt/expectation.json +++ b/tools/wpt/expectation.json @@ -2812,7 +2812,7 @@ ], "class-string-iterator-prototype-object.any.worker.html": [ "Object.prototype.toString applied after deleting @@toStringTag" - ], + ], "class-string-named-properties-object.window.html": false, "global-immutable-prototype.any.html": [ "Setting to a different prototype" @@ -3052,106 +3052,6 @@ "≯ (using .host)", "≯ (using .hostname)" ], - "url-constructor.any.html": [ - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: <\\/localhost//pig> against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: <..//path> against ", - "Parsing: against ", - "Parsing: <> against ", - "Parsing: against " - ], - "url-constructor.any.worker.html": [ - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: <\\/localhost//pig> against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: against ", - "Parsing: <..//path> against ", - "Parsing: against ", - "Parsing: <> against ", - "Parsing: against " - ], "url-origin.any.html": [ "Origin parsing: without base", "Origin parsing: without base", @@ -3167,40 +3067,16 @@ "url-searchparams.any.html": true, "url-searchparams.any.worker.html": true, "url-setters-stripping.any.html": [ - "Setting protocol with leading U+0000 (https:)", - "Setting protocol with U+0000 before inserted colon (https:)", "Setting port with leading U+0000 (https:)", - "Setting pathname with trailing U+0000 (https:)", - "Setting protocol with leading U+001F (https:)", - "Setting protocol with U+001F before inserted colon (https:)", "Setting port with leading U+001F (https:)", - "Setting pathname with trailing U+001F (https:)", - "Setting protocol with leading U+0000 (wpt++:)", - "Setting protocol with U+0000 before inserted colon (wpt++:)", "Setting port with leading U+0000 (wpt++:)", - "Setting pathname with trailing U+0000 (wpt++:)", - "Setting protocol with leading U+001F (wpt++:)", - "Setting protocol with U+001F before inserted colon (wpt++:)", - "Setting port with leading U+001F (wpt++:)", - "Setting pathname with trailing U+001F (wpt++:)" + "Setting port with leading U+001F (wpt++:)" ], "url-setters-stripping.any.worker.html": [ - "Setting protocol with leading U+0000 (https:)", - "Setting protocol with U+0000 before inserted colon (https:)", "Setting port with leading U+0000 (https:)", - "Setting pathname with trailing U+0000 (https:)", - "Setting protocol with leading U+001F (https:)", - "Setting protocol with U+001F before inserted colon (https:)", "Setting port with leading U+001F (https:)", - "Setting pathname with trailing U+001F (https:)", - "Setting protocol with leading U+0000 (wpt++:)", - "Setting protocol with U+0000 before inserted colon (wpt++:)", "Setting port with leading U+0000 (wpt++:)", - "Setting pathname with trailing U+0000 (wpt++:)", - "Setting protocol with leading U+001F (wpt++:)", - "Setting protocol with U+001F before inserted colon (wpt++:)", - "Setting port with leading U+001F (wpt++:)", - "Setting pathname with trailing U+001F (wpt++:)" + "Setting port with leading U+001F (wpt++:)" ], "url-tojson.any.html": true, "url-tojson.any.worker.html": true, @@ -3231,36 +3107,6 @@ "urlsearchparams-sort.any.worker.html": true, "urlsearchparams-stringifier.any.html": true, "urlsearchparams-stringifier.any.worker.html": true, - "url-setters.any.html": [ - "URL: Setting .hostname = 'example.com:8080' : delimiter invalidates entire value", - "URL: Setting .hostname = 'example.com:' : delimiter invalidates entire value", - "URL: Setting .hostname = 'h' Drop /. from path", - "URL: Setting .hostname = ''", - "URL: Setting .pathname = '' Non-special URLs can have their paths erased", - "URL: Setting .pathname = '' Non-special URLs with an empty host can have their paths erased", - "URL: Setting .pathname = '\\\\' File URLs and (back)slashes", - "URL: Setting .pathname = '//\\/' File URLs and (back)slashes", - "URL: Setting .pathname = '//monkey/..//' File URLs and (back)slashes", - "URL: Setting .pathname = '/.//p' Serialize /. in path", - "URL: Setting .pathname = '/..//p'", - "URL: Setting .pathname = '//p'", - "URL: Setting .pathname = 'p' Drop /. from path" - ], - "url-setters.any.worker.html": [ - "URL: Setting .hostname = 'example.com:8080' : delimiter invalidates entire value", - "URL: Setting .hostname = 'example.com:' : delimiter invalidates entire value", - "URL: Setting .hostname = 'h' Drop /. from path", - "URL: Setting .hostname = ''", - "URL: Setting .pathname = '' Non-special URLs can have their paths erased", - "URL: Setting .pathname = '' Non-special URLs with an empty host can have their paths erased", - "URL: Setting .pathname = '\\\\' File URLs and (back)slashes", - "URL: Setting .pathname = '//\\/' File URLs and (back)slashes", - "URL: Setting .pathname = '//monkey/..//' File URLs and (back)slashes", - "URL: Setting .pathname = '/.//p' Serialize /. in path", - "URL: Setting .pathname = '/..//p'", - "URL: Setting .pathname = '//p'", - "URL: Setting .pathname = 'p' Drop /. from path" - ], "idlharness-shadowrealm.window.html": false, "percent-encoding.window.html": [ "Input † with encoding big5", @@ -3278,9 +3124,6 @@ "Input − with encoding utf-8", "Input á| with encoding utf-8" ], - "url-setters-a-area.window.html": { - "ignore": true - }, "IdnaTestV2.window.html": [ "ToASCII(\"a‌b\") C1", "ToASCII(\"A‌B\") C1", @@ -4071,10 +3914,6 @@ ": Setting .pathname = '/foo' Opaque paths cannot be set" ], "url-setters.any.html?exclude=(file|javascript|mailto)": [ - "URL: Setting .protocol = 'https\u0000' Non-tab/newline C0 controls result in no-op", - "URL: Setting .protocol = 'https\f'", - "URL: Setting .protocol = 'https\u000e'", - "URL: Setting .protocol = 'https '", "URL: Setting .hostname = 'example.com:8080' : delimiter invalidates entire value", "URL: Setting .hostname = 'example.com:' : delimiter invalidates entire value", "URL: Setting .hostname = 'h' Drop /. from path", @@ -4086,8 +3925,6 @@ "URL: Setting .pathname = '/..//p'", "URL: Setting .pathname = '//p'", "URL: Setting .pathname = 'p' Drop /. from path", - "URL: Setting .pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020", - "URL: Setting .pathname = 'space '", "URL: Setting .search = '' Do not drop trailing spaces from non-trailing opaque paths", "URL: Setting .search = ''" ], @@ -4099,10 +3936,6 @@ "url-setters.any.html?include=javascript": true, "url-setters.any.html?include=mailto": true, "url-setters.any.worker.html?exclude=(file|javascript|mailto)": [ - "URL: Setting .protocol = 'https\u0000' Non-tab/newline C0 controls result in no-op", - "URL: Setting .protocol = 'https\f'", - "URL: Setting .protocol = 'https\u000e'", - "URL: Setting .protocol = 'https '", "URL: Setting .hostname = 'example.com:8080' : delimiter invalidates entire value", "URL: Setting .hostname = 'example.com:' : delimiter invalidates entire value", "URL: Setting .hostname = 'h' Drop /. from path", @@ -4114,8 +3947,6 @@ "URL: Setting .pathname = '/..//p'", "URL: Setting .pathname = '//p'", "URL: Setting .pathname = 'p' Drop /. from path", - "URL: Setting .pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020", - "URL: Setting .pathname = 'space '", "URL: Setting .search = '' Do not drop trailing spaces from non-trailing opaque paths", "URL: Setting .search = ''" ],