diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ee0c204c..8f23fe53 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - rust-version: [1.64, stable, nightly] + rust-version: [1.82, stable, nightly] name: Native Tests runs-on: ubuntu-latest steps: @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - rust-version: [1.64, stable, nightly] + rust-version: [1.82, stable, nightly] name: Browser Tests runs-on: ubuntu-latest steps: @@ -51,7 +51,7 @@ jobs: run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Setup trunk - uses: jetli/trunk-action@v0.4.0 + uses: jetli/trunk-action@v0.5.1 with: version: 'latest' @@ -84,7 +84,7 @@ jobs: strategy: fail-fast: false matrix: - rust-version: [1.64, stable, nightly] + rust-version: [1.82, stable, nightly] name: Node Tests runs-on: ubuntu-latest steps: @@ -125,20 +125,20 @@ jobs: strategy: fail-fast: false matrix: - rust-version: [1.64, stable, nightly] + rust-version: [1.82, stable, nightly] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust-version }} - target: wasm32-wasi + target: wasm32-wasip1 - name: Install wasmtime run: | - wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz - tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz - mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime - rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + wget https://github.com/bytecodealliance/wasmtime/releases/download/v33.0.2/wasmtime-v33.0.2-x86_64-linux.tar.xz + tar xf wasmtime-v33.0.2-x86_64-linux.tar.xz + mv wasmtime-v33.0.2-x86_64-linux/wasmtime ~/wasmtime + rm -rf wasmtime-v33.0.2-x86_64-linux.tar.xz wasmtime-v33.0.2-x86_64-linux chmod +x ~/wasmtime - uses: actions/cache@v4 @@ -154,8 +154,9 @@ jobs: - name: Build and run example history-wasi run: | - cargo build --package example-history-wasi --target wasm32-wasi - ~/wasmtime --trap-unknown-imports target/wasm32-wasi/debug/example-history-wasi.wasm + rustup target add wasm32-wasip2 + cargo build --package example-history-wasi --target wasm32-wasip2 + ~/wasmtime target/wasm32-wasip2/debug/example-history-wasi.wasm test-worker: name: Test gloo-worker @@ -165,7 +166,7 @@ jobs: matrix: # example: [ markdown, prime ] example: [markdown] - rust-version: [1.64, stable, nightly] + rust-version: [1.82, stable, nightly] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master @@ -177,7 +178,7 @@ jobs: run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Setup trunk - uses: jetli/trunk-action@v0.4.0 + uses: jetli/trunk-action@v0.5.1 with: version: 'latest' @@ -209,7 +210,7 @@ jobs: strategy: fail-fast: false matrix: - rust-version: [1.64, stable, nightly] + rust-version: [1.82, stable, nightly] name: Test gloo-net runs-on: ubuntu-latest services: @@ -263,7 +264,7 @@ jobs: WS_ECHO_SERVER_URL: 'ws://localhost:8081' SSE_ECHO_SERVER_URL: 'http://localhost:8081/.sse' run: cargo test -p gloo-net --features=default,io-util - + - name: Run node tests env: HTTPBIN_URL: 'http://localhost:8080' diff --git a/Cargo.lock b/Cargo.lock index 62f98d9c..f43a6860 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "android-tzdata" @@ -40,39 +40,30 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "basic-toml" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" -dependencies = [ - "serde", -] +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bincode" @@ -85,9 +76,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "block-buffer" @@ -106,9 +97,9 @@ checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -118,37 +109,37 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.0.83" +version = "1.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" dependencies = [ - "libc", + "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-link", ] [[package]] @@ -163,15 +154,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -188,9 +179,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "digest" @@ -202,20 +193,31 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "example-clock" @@ -240,7 +242,7 @@ dependencies = [ "hex", "js-sys", "serde", - "serde-wasm-bindgen 0.6.1", + "serde-wasm-bindgen 0.6.5", "sha2", "wasm-bindgen", "wasm-bindgen-futures", @@ -304,9 +306,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -319,9 +321,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -329,15 +331,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -346,38 +348,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -403,9 +405,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", @@ -416,15 +418,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "gloo" @@ -566,7 +568,7 @@ dependencies = [ "serde", "serde-wasm-bindgen 0.5.0", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", ] @@ -580,9 +582,9 @@ dependencies = [ "gloo-timers 0.3.0", "gloo-utils 0.2.0", "serde", - "serde-wasm-bindgen 0.6.1", + "serde-wasm-bindgen 0.6.5", "serde_urlencoded", - "thiserror", + "thiserror 2.0.12", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -598,12 +600,12 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils 0.1.7", - "http 0.2.11", + "http 0.2.12", "js-sys", "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -619,13 +621,12 @@ dependencies = [ "futures-io", "futures-sink", "gloo-utils 0.2.0", - "http 1.1.0", + "http 1.3.1", "js-sys", - "once_cell", "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 2.0.12", "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test", @@ -660,7 +661,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", ] @@ -673,7 +674,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror", + "thiserror 2.0.12", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -756,7 +757,7 @@ dependencies = [ "js-sys", "pinned", "serde", - "thiserror", + "thiserror 2.0.12", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -770,23 +771,23 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", "trybuild", ] [[package]] name = "h2" -version = "0.3.22" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.10.0", "slab", "tokio", "tokio-util", @@ -801,9 +802,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" [[package]] name = "headers" @@ -814,7 +815,7 @@ dependencies = [ "base64", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -826,14 +827,14 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -843,9 +844,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -854,9 +855,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -870,15 +871,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" @@ -888,22 +889,22 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -912,14 +913,15 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -933,21 +935,118 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "potential_utf", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" + +[[package]] +name = "icu_provider" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +dependencies = [ + "displaydoc", + "icu_locale_core", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "implicit-clone" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd6201e7c30ccb24773cac7efa6fec1e06189d414b7439ce756a481c8bfbf53" +checksum = "92d6dc8dce3dddd0bc92f5741980eb67c04cb6967d90cb94482741b254ad7555" dependencies = [ "indexmap 1.9.3", ] @@ -964,40 +1063,58 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.4", +] + +[[package]] +name = "io-uring" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013" +dependencies = [ + "bitflags", + "cfg-if", + "libc", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.150" +version = "0.2.174" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" + +[[package]] +name = "litemap" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ "autocfg", "scopeguard", @@ -1005,15 +1122,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "mime" @@ -1023,32 +1140,42 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", ] +[[package]] +name = "minicov" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "0.8.10" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1060,7 +1187,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "memchr", @@ -1071,18 +1198,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ "hermit-abi", "libc", @@ -1090,24 +1217,24 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", "parking_lot_core", @@ -1115,9 +1242,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", @@ -1134,29 +1261,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1172,14 +1299,26 @@ checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" dependencies = [ "futures", "rustversion", - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", ] [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" @@ -1199,11 +1338,10 @@ checksum = "68a61082d8bceecd71a3870e9162002bb75f7ba9c7aa8b76227e887782fef9c8" [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ - "once_cell", "toml_edit", ] @@ -1233,9 +1371,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -1259,9 +1397,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ "bitflags", "memchr", @@ -1270,9 +1408,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -1309,39 +1447,39 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "de3a5d9f0aba1dbcec1cc47f0ff94a4b778fe55bca98a6dfa92e4e094e57b1c4" dependencies = [ "bitflags", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" [[package]] -name = "rustls-pemfile" -version = "1.0.4" +name = "rustversion" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] -name = "rustversion" -version = "1.0.14" +name = "ryu" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] -name = "ryu" -version = "1.0.15" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "scoped-tls" @@ -1357,9 +1495,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -1377,9 +1515,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" dependencies = [ "js-sys", "serde", @@ -1388,26 +1526,36 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1433,57 +1581,50 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] [[package]] name = "slab" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1492,6 +1633,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "syn" version = "1.0.109" @@ -1505,94 +1652,127 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "target-triple" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790" + [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.12", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "thiserror-impl" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ - "tinyvec_macros", + "proc-macro2", + "quote", + "syn 2.0.104", ] [[package]] -name = "tinyvec_macros" -version = "0.1.1" +name = "tinystr" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec", +] [[package]] name = "tokio" -version = "1.35.0" +version = "1.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "slab", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -1601,9 +1781,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -1613,46 +1793,84 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", +] + +[[package]] +name = "toml" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac" +dependencies = [ + "indexmap 2.10.0", + "serde", + "serde_spanned", + "toml_datetime 0.7.0", + "toml_parser", + "toml_writer", + "winnow", ] [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" + +[[package]] +name = "toml_datetime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 1.9.3", - "toml_datetime", + "indexmap 2.10.0", + "toml_datetime 0.6.11", "winnow", ] +[[package]] +name = "toml_parser" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_writer" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" + [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -1662,20 +1880,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] @@ -1688,79 +1906,61 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.85" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" +checksum = "65af40ad689f2527aebbd37a0a816aea88ff5f774ceabe99de5be02f2f91dae2" dependencies = [ - "basic-toml", "glob", - "once_cell", "serde", "serde_derive", "serde_json", + "target-triple", "termcolor", + "toml", ] [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.11", + "http 1.3.1", "httparse", "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "url" -version = "2.5.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -1773,11 +1973,27 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] [[package]] name = "want" @@ -1790,15 +2006,15 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ "bytes", "futures-channel", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "hyper", "log", "mime", @@ -1806,13 +2022,11 @@ dependencies = [ "multer", "percent-encoding", "pin-project", - "rustls-pemfile", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-stream", "tokio-tungstenite", "tokio-util", "tower-service", @@ -1821,52 +2035,54 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1874,32 +2090,34 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-bindgen-test" -version = "0.3.39" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" +checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3" dependencies = [ - "console_error_panic_hook", "js-sys", - "scoped-tls", + "minicov", "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test-macro", @@ -1907,13 +2125,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.39" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" +checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.104", ] [[package]] @@ -1931,72 +2149,110 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "winapi-util" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-sys 0.59.0", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-core" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] [[package]] -name = "winapi-util" -version = "0.1.6" +name = "windows-implement" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ - "winapi", + "proc-macro2", + "quote", + "syn 2.0.104", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-interface" +version = "0.59.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ "windows-targets", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -2005,55 +2261,67 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.4.1" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" dependencies = [ "memchr", ] +[[package]] +name = "writeable" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" + [[package]] name = "yew" version = "0.20.0" @@ -2070,7 +2338,7 @@ dependencies = [ "rustversion", "serde", "slab", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "wasm-bindgen", @@ -2093,3 +2361,101 @@ dependencies = [ "quote", "syn 1.0.109", ] + +[[package]] +name = "yoke" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] diff --git a/Cargo.toml b/Cargo.toml index 6b7f4ede..a2c867f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,9 @@ repository = "https://github.com/rustwasm/gloo" homepage = "https://gloo-rs.web.app/" documentation = "https://docs.rs/gloo/" categories = ["api-bindings", "wasm"] -rust-version = "1.64" + +[workspace.package] +rust-version = "1.82" [dependencies] gloo-timers = { version = "0.3", path = "crates/timers", optional = true } @@ -25,27 +27,34 @@ gloo-history = { version = "0.2", path = "crates/history", optional = true } gloo-worker = { version = "0.5", path = "crates/worker", optional = true } gloo-net = { version = "0.6", path = "crates/net", optional = true } +[workspace.dependencies] +thiserror = "2.0" +wasm-bindgen-futures = "0.4.4" +wasm-bindgen = "0.2" +wasm-bindgen-test = "0.3.4" +js-sys = "0.3.77" + [features] default = [ - "timers", - "events", - "file", - "dialogs", - "storage", - "render", - "console", - "utils", - "history", - "worker", - "net", + "timers", + "events", + "file", + "dialogs", + "storage", + "render", + "console", + "utils", + "history", + "worker", + "net", ] futures = [ - "timers", - "file", - "worker", - "gloo-timers/futures", - "gloo-file/futures", - "gloo-worker/futures", + "timers", + "file", + "worker", + "gloo-timers/futures", + "gloo-file/futures", + "gloo-worker/futures", ] timers = ["gloo-timers"] events = ["gloo-events"] @@ -61,24 +70,24 @@ net = ["gloo-net"] [workspace] members = [ - "crates/timers", - "crates/events", - "crates/net", - "crates/file", - "crates/dialogs", - "crates/storage", - "crates/console", - "crates/utils", - "crates/history", - "crates/worker", - "crates/worker-macros", - "crates/net", + "crates/timers", + "crates/events", + "crates/net", + "crates/file", + "crates/dialogs", + "crates/storage", + "crates/console", + "crates/utils", + "crates/history", + "crates/worker", + "crates/worker-macros", + "crates/net", - "examples/markdown", - "examples/clock", - "examples/file-hash", - "examples/history-wasi", - "examples/prime", + "examples/markdown", + "examples/clock", + "examples/file-hash", + "examples/history-wasi", + "examples/prime", ] # Passing arguments to the docsrs builder in order to properly document cfg's. diff --git a/crates/console/Cargo.toml b/crates/console/Cargo.toml index d55ed580..3fc0f119 100644 --- a/crates/console/Cargo.toml +++ b/crates/console/Cargo.toml @@ -10,11 +10,11 @@ repository = "https://github.com/rustwasm/gloo/tree/master/crates/console" homepage = "https://github.com/rustwasm/gloo" documentation = "https://docs.rs/gloo-console/" categories = ["api-bindings", "development-tools::profiling", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] -wasm-bindgen = "0.2" -js-sys = "0.3" +wasm-bindgen = { workspace = true } +js-sys = { workspace = true } serde = { version = "1", features = ["derive"] } gloo-utils = { version = "0.2", path = "../utils", features = ["serde"] } [dependencies.web-sys] @@ -22,5 +22,5 @@ version = "0.3" features = ["console", "Document"] [dev-dependencies] -wasm-bindgen-test = "0.3.4" +wasm-bindgen-test = { workspace = true } gloo-timers = { version = "0.3.0", path = "../timers" } diff --git a/crates/dialogs/Cargo.toml b/crates/dialogs/Cargo.toml index 279cfefd..a2e2bd0c 100644 --- a/crates/dialogs/Cargo.toml +++ b/crates/dialogs/Cargo.toml @@ -9,10 +9,10 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/dialogs" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "asynchronous", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] -wasm-bindgen = "0.2" +wasm-bindgen = { workspace = true } [dependencies.web-sys] version = "0.3" diff --git a/crates/events/Cargo.toml b/crates/events/Cargo.toml index 6635d1aa..22d67de0 100644 --- a/crates/events/Cargo.toml +++ b/crates/events/Cargo.toml @@ -9,27 +9,27 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/events" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "asynchronous", "web-programming", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] -wasm-bindgen = "0.2" +wasm-bindgen = { workspace = true } [dependencies.web-sys] version = "0.3.31" features = ["Event", "EventTarget", "AddEventListenerOptions"] [dev-dependencies] -js-sys = "0.3.31" +js-sys = { workspace = true } futures = "0.3" -wasm-bindgen-test = "0.3.4" +wasm-bindgen-test = { workspace = true } [dev-dependencies.web-sys] version = "0.3.31" features = [ - "HtmlElement", - "Window", - "Document", - "Element", - "MouseEvent", - "ProgressEvent", + "HtmlElement", + "Window", + "Document", + "Element", + "MouseEvent", + "ProgressEvent", ] diff --git a/crates/events/src/lib.rs b/crates/events/src/lib.rs index 118c28f6..60b48071 100644 --- a/crates/events/src/lib.rs +++ b/crates/events/src/lib.rs @@ -152,11 +152,11 @@ impl EventListenerOptions { #[inline] fn as_js(&self, once: bool) -> AddEventListenerOptions { - let mut options = AddEventListenerOptions::new(); + let options = AddEventListenerOptions::new(); - options.capture(self.phase.is_capture()); - options.once(once); - options.passive(self.passive); + options.set_capture(self.phase.is_capture()); + options.set_once(once); + options.set_passive(self.passive); options } diff --git a/crates/file/Cargo.toml b/crates/file/Cargo.toml index 4f8ea331..a86cda79 100644 --- a/crates/file/Cargo.toml +++ b/crates/file/Cargo.toml @@ -9,14 +9,14 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/file" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "asynchronous", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [package.metadata.docs.rs] features = ["futures"] [dependencies] -wasm-bindgen = "0.2" -js-sys = "0.3.31" +wasm-bindgen = { workspace = true } +js-sys = { workspace = true } gloo-events = { path = "../events", version = "0.2" } mime = { version = "0.3.13", optional = true } futures-channel = { version = "0.3", optional = true } @@ -24,21 +24,21 @@ futures-channel = { version = "0.3", optional = true } [dependencies.web-sys] version = "0.3.31" features = [ - "Blob", - "File", - "FileList", - "FileReader", - "HtmlInputElement", - "BlobPropertyBag", - "FilePropertyBag", - "DomException", - "Url", + "Blob", + "File", + "FileList", + "FileReader", + "HtmlInputElement", + "BlobPropertyBag", + "FilePropertyBag", + "DomException", + "Url", ] [dev-dependencies] futures_rs = { version = "0.3", package = "futures" } -wasm-bindgen-test = "0.3.4" -wasm-bindgen-futures = "0.4" +wasm-bindgen-test = { workspace = true } +wasm-bindgen-futures = { workspace = true } chrono = { version = "0.4.10", features = ["wasmbind"] } [dev-dependencies.web-sys] diff --git a/crates/file/src/blob.rs b/crates/file/src/blob.rs index 4f2d41a0..912e7523 100644 --- a/crates/file/src/blob.rs +++ b/crates/file/src/blob.rs @@ -82,9 +82,9 @@ impl Blob { where T: BlobContents, { - let mut properties = web_sys::BlobPropertyBag::new(); + let properties = web_sys::BlobPropertyBag::new(); if let Some(mime_type) = mime_type { - properties.type_(mime_type); + properties.set_type(mime_type); } // SAFETY: The slice will live for the duration of this function call, @@ -209,9 +209,9 @@ impl File { where T: BlobContents, { - let mut options = web_sys::FilePropertyBag::new(); + let options = web_sys::FilePropertyBag::new(); if let Some(mime_type) = mime_type { - options.type_(mime_type); + options.set_type(mime_type); } if let Some(last_modified_time) = last_modified_time { @@ -219,7 +219,7 @@ impl File { Ok(duration) => safe_u128_to_f64(duration.as_millis()), Err(time_err) => -safe_u128_to_f64(time_err.duration().as_millis()), }; - options.last_modified(duration); + options.set_last_modified(duration); } // SAFETY: The original reference will live for the duration of this function call, diff --git a/crates/history/Cargo.toml b/crates/history/Cargo.toml index c0853ba5..533698c2 100644 --- a/crates/history/Cargo.toml +++ b/crates/history/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/history" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "history", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] gloo-utils = { version = "0.2.0", path = "../utils" } @@ -17,7 +17,7 @@ gloo-events = { version = "0.2.0", path = "../events" } serde = { version = "1", features = ["derive"] } serde-wasm-bindgen = "0.6.0" serde_urlencoded = { version = "0.7", optional = true } -thiserror = { version = "1.0", optional = true } +thiserror = { workspace = true, optional = true } wasm-bindgen = "0.2.88" [dependencies.web-sys] @@ -28,7 +28,7 @@ features = ["History", "Window", "Location", "Url"] getrandom = { version = "0.2.10", features = ["js"] } [dev-dependencies] -wasm-bindgen-test = "0.3" +wasm-bindgen-test = { workspace = true } gloo-timers = { version = "0.3.0", features = ["futures"], path = "../timers" } [features] diff --git a/crates/net/Cargo.toml b/crates/net/Cargo.toml index 177d0d77..88cf7a6e 100644 --- a/crates/net/Cargo.toml +++ b/crates/net/Cargo.toml @@ -2,8 +2,8 @@ name = "gloo-net" version = "0.6.0" authors = [ - "Rust and WebAssembly Working Group", - "Elina ", + "Rust and WebAssembly Working Group", + "Elina ", ] edition = "2021" license = "MIT OR Apache-2.0" @@ -12,7 +12,7 @@ description = "HTTP requests library for WASM Apps" readme = "README.md" keywords = ["requests", "http", "wasm", "websockets"] categories = ["wasm", "web-programming::http-client", "api-bindings"] -rust-version = "1.64" +rust-version = { workspace = true } [package.metadata.docs.rs] all-features = true @@ -21,15 +21,15 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] wasm-bindgen = "0.2" web-sys = "0.3" -js-sys = "0.3" +js-sys = { workspace = true } gloo-utils = { version = "0.2", path = "../utils", default-features = false } -wasm-bindgen-futures = "0.4" +wasm-bindgen-futures = { workspace = true } futures-core = { version = "0.3", optional = true } futures-sink = { version = "0.3", optional = true } futures-io = { version = "0.3", optional = true } -thiserror = "1.0" +thiserror = { workspace = true } serde = { version = "1.0", optional = true } serde_json = { version = "1.0", optional = true } @@ -39,12 +39,10 @@ pin-project = { version = "1.0", optional = true } http = "1.0" [dev-dependencies] -wasm-bindgen-test = "0.3" +wasm-bindgen-test = { workspace = true } futures = "0.3" serde = { version = "1.0", features = ["derive"] } -once_cell = "1" - [features] default = ["json", "websocket", "http", "eventsource"] @@ -52,51 +50,51 @@ default = ["json", "websocket", "http", "eventsource"] json = ["serde", "serde_json", "gloo-utils/serde"] # Enables the WebSocket API websocket = [ - 'web-sys/WebSocket', - 'web-sys/AddEventListenerOptions', - 'web-sys/ErrorEvent', - 'web-sys/FileReader', - 'web-sys/MessageEvent', - 'web-sys/ProgressEvent', - 'web-sys/CloseEvent', - 'web-sys/CloseEventInit', - 'web-sys/BinaryType', - 'web-sys/Blob', - "futures-channel", - "futures-core", - "futures-sink", - "pin-project", + 'web-sys/WebSocket', + 'web-sys/AddEventListenerOptions', + 'web-sys/ErrorEvent', + 'web-sys/FileReader', + 'web-sys/MessageEvent', + 'web-sys/ProgressEvent', + 'web-sys/CloseEvent', + 'web-sys/CloseEventInit', + 'web-sys/BinaryType', + 'web-sys/Blob', + "futures-channel", + "futures-core", + "futures-sink", + "pin-project", ] # Enables the HTTP API http = [ - 'web-sys/Headers', - 'web-sys/UrlSearchParams', - 'web-sys/Url', - 'web-sys/Request', - 'web-sys/RequestInit', - 'web-sys/RequestMode', - 'web-sys/Response', - 'web-sys/ResponseInit', - 'web-sys/ResponseType', - 'web-sys/RequestCache', - 'web-sys/RequestCredentials', - 'web-sys/ObserverCallback', - 'web-sys/RequestRedirect', - 'web-sys/ReferrerPolicy', - 'web-sys/AbortSignal', - 'web-sys/ReadableStream', - 'web-sys/Blob', - 'web-sys/FormData', + 'web-sys/Headers', + 'web-sys/UrlSearchParams', + 'web-sys/Url', + 'web-sys/Request', + 'web-sys/RequestInit', + 'web-sys/RequestMode', + 'web-sys/Response', + 'web-sys/ResponseInit', + 'web-sys/ResponseType', + 'web-sys/RequestCache', + 'web-sys/RequestCredentials', + 'web-sys/ObserverCallback', + 'web-sys/RequestRedirect', + 'web-sys/ReferrerPolicy', + 'web-sys/AbortSignal', + 'web-sys/ReadableStream', + 'web-sys/Blob', + 'web-sys/FormData', ] # Enables the EventSource API eventsource = [ - "futures-channel", - "futures-core", - "pin-project", - 'web-sys/Event', - 'web-sys/EventTarget', - 'web-sys/EventSource', - 'web-sys/MessageEvent', + "futures-channel", + "futures-core", + "pin-project", + 'web-sys/Event', + 'web-sys/EventTarget', + 'web-sys/EventSource', + 'web-sys/MessageEvent', ] # As of now, only implements `AsyncRead` and `AsyncWrite` on `WebSocket` io-util = ["futures-io"] diff --git a/crates/net/src/http/request.rs b/crates/net/src/http/request.rs index 1950d856..fc0419a8 100644 --- a/crates/net/src/http/request.rs +++ b/crates/net/src/http/request.rs @@ -49,22 +49,22 @@ impl RequestBuilder { } /// Set the body for this request. - pub fn body(mut self, body: impl Into) -> Result { - self.options.body(Some(&body.into())); + pub fn body(self, body: impl Into) -> Result { + self.options.set_body(&body.into()); self.try_into() } /// A string indicating how the request will interact with the browser’s HTTP cache. - pub fn cache(mut self, cache: RequestCache) -> Self { - self.options.cache(cache); + pub fn cache(self, cache: RequestCache) -> Self { + self.options.set_cache(cache); self } /// Controls what browsers do with credentials (cookies, HTTP authentication entries, and TLS /// client certificates). - pub fn credentials(mut self, credentials: RequestCredentials) -> Self { - self.options.credentials(credentials); + pub fn credentials(self, credentials: RequestCredentials) -> Self { + self.options.set_credentials(credentials); self } @@ -120,8 +120,8 @@ impl RequestBuilder { /// The subresource integrity value of the request (e.g., /// `sha256-BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=`). - pub fn integrity(mut self, integrity: &str) -> Self { - self.options.integrity(integrity); + pub fn integrity(self, integrity: &str) -> Self { + self.options.set_integrity(integrity); self } @@ -138,20 +138,20 @@ impl RequestBuilder { } /// The request method, e.g., GET, POST. - pub fn method(mut self, method: Method) -> Self { - self.options.method(method.as_ref()); + pub fn method(self, method: Method) -> Self { + self.options.set_method(method.as_ref()); self } /// The mode you want to use for the request. - pub fn mode(mut self, mode: RequestMode) -> Self { - self.options.mode(mode); + pub fn mode(self, mode: RequestMode) -> Self { + self.options.set_mode(mode); self } /// Sets the observer callback. - pub fn observe(mut self, observe: &ObserverCallback) -> Self { - self.options.observe(observe); + pub fn observe(self, observe: &ObserverCallback) -> Self { + self.options.set_observe(observe); self } @@ -162,30 +162,30 @@ impl RequestBuilder { /// - *error*: Abort with an error if a redirect occurs. /// - *manual*: Caller intends to process the response in another context. See [WHATWG fetch /// standard](https://fetch.spec.whatwg.org/#requests) for more information. - pub fn redirect(mut self, redirect: RequestRedirect) -> Self { - self.options.redirect(redirect); + pub fn redirect(self, redirect: RequestRedirect) -> Self { + self.options.set_redirect(redirect); self } /// The referrer of the request. /// /// This can be a same-origin URL, `about:client`, or an empty string. - pub fn referrer(mut self, referrer: &str) -> Self { - self.options.referrer(referrer); + pub fn referrer(self, referrer: &str) -> Self { + self.options.set_referrer(referrer); self } /// Specifies the /// [referrer policy](https://w3c.github.io/webappsec-referrer-policy/#referrer-policies) to /// use for the request. - pub fn referrer_policy(mut self, referrer_policy: ReferrerPolicy) -> Self { - self.options.referrer_policy(referrer_policy); + pub fn referrer_policy(self, referrer_policy: ReferrerPolicy) -> Self { + self.options.set_referrer_policy(referrer_policy); self } /// Sets the request abort signal. - pub fn abort_signal(mut self, signal: Option<&AbortSignal>) -> Self { - self.options.signal(signal); + pub fn abort_signal(self, signal: Option<&AbortSignal>) -> Self { + self.options.set_signal(signal); self } /// Builds the request and send it to the server, returning the received response. @@ -202,7 +202,7 @@ impl RequestBuilder { impl TryFrom for Request { type Error = crate::error::Error; - fn try_from(mut value: RequestBuilder) -> Result { + fn try_from(value: RequestBuilder) -> Result { // To preserve existing query parameters of self.url, it must be parsed and extended with // self.query's parameters. As web_sys::Url just accepts absolute URLs, retrieve the // absolute URL through creating a web_sys::Request object. @@ -215,7 +215,7 @@ impl TryFrom for Request { url.set_search(&combined_query); let final_url = String::from(url.to_string()); - value.options.headers(&value.headers.into_raw()); + value.options.set_headers(&value.headers.into_raw()); let request = web_sys::Request::new_with_str_and_init(&final_url, &value.options) .map_err(js_to_error)?; diff --git a/crates/net/src/http/response.rs b/crates/net/src/http/response.rs index 3f1e6f94..7eb06817 100644 --- a/crates/net/src/http/response.rs +++ b/crates/net/src/http/response.rs @@ -178,14 +178,14 @@ impl ResponseBuilder { } /// Set the status code - pub fn status(mut self, status: u16) -> Self { - self.options.status(status); + pub fn status(self, status: u16) -> Self { + self.options.set_status(status); self } /// Set the status text - pub fn status_text(mut self, status_text: &str) -> Self { - self.options.status_text(status_text); + pub fn status_text(self, status_text: &str) -> Self { + self.options.set_status_text(status_text); self } @@ -203,11 +203,11 @@ impl ResponseBuilder { } /// Set the response body and return the response - pub fn body(mut self, data: T) -> Result + pub fn body(self, data: T) -> Result where T: IntoRawResponse, { - self.options.headers(&self.headers.into_raw()); + self.options.set_headers(&self.headers.into_raw()); let init = self.options; data.into_raw(init).map(Response).map_err(js_to_error) diff --git a/crates/net/src/websocket/futures.rs b/crates/net/src/websocket/futures.rs index 7e87c466..29c24adb 100644 --- a/crates/net/src/websocket/futures.rs +++ b/crates/net/src/websocket/futures.rs @@ -140,10 +140,12 @@ impl WebSocket { }) as Box) }; + let add_event_listener_options = web_sys::AddEventListenerOptions::new(); + add_event_listener_options.set_once(true); ws.add_event_listener_with_callback_and_add_event_listener_options( "open", open_callback.as_ref().unchecked_ref(), - web_sys::AddEventListenerOptions::new().once(true), + &add_event_listener_options, ) .map_err(js_to_js_error)?; @@ -184,10 +186,12 @@ impl WebSocket { }) as Box) }; + let add_event_listerner_options = web_sys::AddEventListenerOptions::new(); + add_event_listerner_options.set_once(true); ws.add_event_listener_with_callback_and_add_event_listener_options( "close", close_callback.as_ref().unchecked_ref(), - web_sys::AddEventListenerOptions::new().once(true), + &add_event_listerner_options, ) .map_err(js_to_js_error)?; @@ -339,12 +343,12 @@ impl PinnedDrop for WebSocket { .remove_event_listener_with_callback(ty, cb.unchecked_ref()); } - if let Ok(close_event) = web_sys::CloseEvent::new_with_event_init_dict( - "close", - web_sys::CloseEventInit::new() - .code(1000) - .reason("client dropped"), - ) { + let close_event_init = web_sys::CloseEventInit::new(); + close_event_init.set_code(1000); + close_event_init.set_reason("client dropped"); + if let Ok(close_event) = + web_sys::CloseEvent::new_with_event_init_dict("close", &close_event_init) + { let _ = self.ws.dispatch_event(&close_event); } } diff --git a/crates/net/tests/http.rs b/crates/net/tests/http.rs index 38198c79..898ef9e8 100644 --- a/crates/net/tests/http.rs +++ b/crates/net/tests/http.rs @@ -1,13 +1,13 @@ use gloo_net::http::Request; -use once_cell::sync::Lazy; use serde::{Deserialize, Serialize}; +use std::sync::LazyLock; use wasm_bindgen_test::*; -#[cfg(feature = "browser_test")] +#[cfg(feature = "browser-test")] wasm_bindgen_test_configure!(run_in_browser); -static HTTPBIN_URL: Lazy<&'static str> = - Lazy::new(|| option_env!("HTTPBIN_URL").expect("Did you set HTTPBIN_URL?")); +static HTTPBIN_URL: LazyLock<&'static str> = + LazyLock::new(|| option_env!("HTTPBIN_URL").expect("Did you set HTTPBIN_URL?")); #[wasm_bindgen_test] async fn fetch() { diff --git a/crates/net/tests/query.rs b/crates/net/tests/query.rs index 4492066a..f62750e5 100644 --- a/crates/net/tests/query.rs +++ b/crates/net/tests/query.rs @@ -1,7 +1,7 @@ use gloo_net::http::QueryParams; use wasm_bindgen_test::*; -#[cfg(feature = "browser_test")] +#[cfg(feature = "browser-test")] wasm_bindgen_test_configure!(run_in_browser); #[wasm_bindgen_test] diff --git a/crates/render/Cargo.toml b/crates/render/Cargo.toml index f9e52e3c..655c853c 100644 --- a/crates/render/Cargo.toml +++ b/crates/render/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/storage" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "storage", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] wasm-bindgen = "0.2" diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 56172162..1795f464 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -9,19 +9,19 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/storage" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "storage", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] wasm-bindgen = "0.2" serde = "1.0" serde_json = "1.0" -thiserror = "1.0" -js-sys = "0.3" +thiserror = { workspace = true } +js-sys = { workspace = true } gloo-utils = { version = "0.2", path = "../utils" } [dependencies.web-sys] version = "0.3" features = ["Storage", "Window"] [dev-dependencies] -wasm-bindgen-test = "0.3" +wasm-bindgen-test = { workspace = true } serde = { version = "1.0", features = ["derive"] } diff --git a/crates/timers/Cargo.toml b/crates/timers/Cargo.toml index 2bbce122..563b7ddf 100644 --- a/crates/timers/Cargo.toml +++ b/crates/timers/Cargo.toml @@ -9,14 +9,14 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/timers" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "asynchronous", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [package.metadata.docs.rs] features = ["futures"] [dependencies] wasm-bindgen = "0.2" -js-sys = "0.3.31" +js-sys = { workspace = true } futures-core = { version = "0.3", optional = true } futures-channel = { version = "0.3", optional = true } @@ -26,6 +26,6 @@ futures = ["futures-core", "futures-channel"] [dev-dependencies] -wasm-bindgen-futures = "0.4.4" -wasm-bindgen-test = "0.3.4" +wasm-bindgen-futures = { workspace = true } +wasm-bindgen-test = { workspace = true } futures-util = "0.3" diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 571017f7..1bce9f78 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -9,25 +9,25 @@ readme = "README.md" repository = "https://github.com/rustwasm/gloo/tree/master/crates/utils" homepage = "https://github.com/rustwasm/gloo" categories = ["api-bindings", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] wasm-bindgen = "0.2" -js-sys = "0.3" +js-sys = { workspace = true } serde = { version = "1.0", optional = true } serde_json = { version = "1.0", optional = true } [dependencies.web-sys] version = "0.3" features = [ - "Document", - "History", - "HtmlElement", - "Location", - "Window", - "HtmlHeadElement", - "Element", + "Document", + "History", + "HtmlElement", + "Location", + "Window", + "HtmlHeadElement", + "Element", ] [features] @@ -35,7 +35,7 @@ default = ["serde"] serde = ["dep:serde", "dep:serde_json"] [dev-dependencies] -wasm-bindgen-test = "0.3" +wasm-bindgen-test = { workspace = true } serde_derive = "1.0" [package.metadata.docs.rs] diff --git a/crates/worker-macros/Cargo.toml b/crates/worker-macros/Cargo.toml index 474cd466..bd76fe3d 100644 --- a/crates/worker-macros/Cargo.toml +++ b/crates/worker-macros/Cargo.toml @@ -9,13 +9,13 @@ repository = "https://github.com/rustwasm/gloo/tree/master/crates/worker" homepage = "https://github.com/rustwasm/gloo" license = "MIT OR Apache-2.0" categories = ["api-bindings", "asynchronous", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [lib] proc-macro = true [dependencies] -proc-macro-crate = "1.2.1" +proc-macro-crate = "3.3.0" proc-macro2 = "1.0.47" quote = "1.0.21" syn = { version = "2.0.15", features = ["full"] } diff --git a/crates/worker/Cargo.toml b/crates/worker/Cargo.toml index d950da18..d22b1d27 100644 --- a/crates/worker/Cargo.toml +++ b/crates/worker/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/rustwasm/gloo/tree/master/crates/worker" homepage = "https://github.com/rustwasm/gloo" license = "MIT OR Apache-2.0" categories = ["api-bindings", "asynchronous", "wasm"] -rust-version = "1.64" +rust-version = { workspace = true } [package.metadata.docs.rs] all-features = true @@ -21,24 +21,24 @@ rustdoc-args = ["--cfg", "docsrs"] bincode = "1" gloo-utils = { path = "../utils", version = "0.2" } gloo-worker-macros = { path = "../worker-macros", version = "0.1" } -js-sys = "0.3" +js-sys = { workspace = true } pinned = "0.1.0" serde = { version = "1", features = ["derive"] } wasm-bindgen = "0.2" -wasm-bindgen-futures = { version = "0.4" } +wasm-bindgen-futures = { workspace = true } futures = { version = "0.3", features = ["std"], default-features = false } -thiserror = "1.0.37" +thiserror = { workspace = true } [dependencies.web-sys] version = "0.3" features = [ - "Blob", - "BlobPropertyBag", - "DedicatedWorkerGlobalScope", - "MessageEvent", - "Url", - "Worker", - "WorkerOptions", + "Blob", + "BlobPropertyBag", + "DedicatedWorkerGlobalScope", + "MessageEvent", + "Url", + "Worker", + "WorkerOptions", ] [features] diff --git a/crates/worker/src/actor/spawner.rs b/crates/worker/src/actor/spawner.rs index fbe0c64f..22cc0239 100644 --- a/crates/worker/src/actor/spawner.rs +++ b/crates/worker/src/actor/spawner.rs @@ -30,11 +30,9 @@ fn create_worker(path: &str) -> DedicatedWorker { let array = Array::new(); array.push(&format!(r#"importScripts("{js_shim_url}");wasm_bindgen("{wasm_url}");"#).into()); - let blob = Blob::new_with_str_sequence_and_options( - &array, - BlobPropertyBag::new().type_("application/javascript"), - ) - .unwrap(); + let blob_property_bag = BlobPropertyBag::new(); + blob_property_bag.set_type("application/javascript"); + let blob = Blob::new_with_str_sequence_and_options(&array, &blob_property_bag).unwrap(); let url = Url::create_object_url_with_blob(&blob).unwrap(); DedicatedWorker::new(&url).expect("failed to spawn worker") diff --git a/examples/clock/Cargo.toml b/examples/clock/Cargo.toml index 9a331b39..10d4e35b 100644 --- a/examples/clock/Cargo.toml +++ b/examples/clock/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Rust and WebAssembly Working Group"] edition = "2021" publish = false -rust-version = "1.64" +rust-version = { workspace = true } [lib] crate-type = ["cdylib"] @@ -12,7 +12,7 @@ crate-type = ["cdylib"] [dependencies] gloo = { path = "../..", features = ["futures"] } wasm-bindgen = "0.2.54" -wasm-bindgen-futures = "0.4.4" +wasm-bindgen-futures = { workspace = true } futures-util = "0.3" chrono = { version = "0.4.10", features = ["wasmbind"] } console_error_panic_hook = "0.1.6" diff --git a/examples/file-hash/Cargo.toml b/examples/file-hash/Cargo.toml index bc7387f0..4eb505cd 100644 --- a/examples/file-hash/Cargo.toml +++ b/examples/file-hash/Cargo.toml @@ -12,7 +12,7 @@ publish = false gloo-worker = { path = "../../crates/worker" } serde = "1.0.163" web-sys = { version = "0.3.63", features = ["File", "Blob", "ReadableStream"] } -wasm-bindgen-futures = { version = "0.4" } +wasm-bindgen-futures = { workspace = true } wasm-streams = "0.3.0" wasm-bindgen = "0.2.86" futures = "0.3.28" @@ -20,5 +20,5 @@ sha2 = "0.10.8" console_error_panic_hook = "0.1.7" yew = { version = "0.20.0", features = ["csr"] } serde-wasm-bindgen = "0.6.0" -js-sys = "0.3.63" +js-sys = { workspace = true } hex = "0.4.3" diff --git a/examples/history-wasi/Cargo.toml b/examples/history-wasi/Cargo.toml index 78522958..469909d5 100644 --- a/examples/history-wasi/Cargo.toml +++ b/examples/history-wasi/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Rust and WebAssembly Working Group"] edition = "2021" publish = false -rust-version = "1.64" +rust-version = { workspace = true } [dependencies] gloo = { path = "../..", default-features = false, features = ["history"] } diff --git a/examples/history-wasi/README.md b/examples/history-wasi/README.md index 817b3de2..0a1d0ded 100644 --- a/examples/history-wasi/README.md +++ b/examples/history-wasi/README.md @@ -5,6 +5,6 @@ This is a simple example showcasing the Gloo History on WASI. You can run this example with: ```bash -cargo build --manifest-path examples/history-wasi/Cargo.toml --target wasm32-wasi +cargo build --manifest-path examples/history-wasi/Cargo.toml --target wasm32-wasip1 wasmtime examples/history-wasi/target/wasm32-wasi/debug/example-history-wasi.wasm ``` diff --git a/examples/markdown/Cargo.toml b/examples/markdown/Cargo.toml index 1e78c48e..8f661c9a 100644 --- a/examples/markdown/Cargo.toml +++ b/examples/markdown/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Rust and WebAssembly Working Group"] edition = "2021" publish = false -rust-version = "1.64" +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -12,11 +12,11 @@ rust-version = "1.64" pulldown-cmark = { version = "0.9.1", default-features = false } gloo = { path = "../..", features = ["futures"] } +js-sys = { workspace = true } console_error_panic_hook = "0.1.7" wasm-bindgen = "0.2" -wasm-bindgen-futures = { version = "0.4" } -js-sys = "0.3" -wasm-bindgen-test = "0.3.4" +wasm-bindgen-futures = { workspace = true } +wasm-bindgen-test = { workspace = true } futures = "0.3" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] diff --git a/examples/prime/Cargo.toml b/examples/prime/Cargo.toml index 70944fba..a9893ff9 100644 --- a/examples/prime/Cargo.toml +++ b/examples/prime/Cargo.toml @@ -2,7 +2,7 @@ name = "example-prime" version = "0.1.0" edition = "2021" -rust-version = "1.64" +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,7 +10,7 @@ rust-version = "1.64" futures = "0.3.25" gloo = { path = "../..", features = ["futures"] } primes = "0.3.0" -wasm-bindgen-futures = "0.4.33" +wasm-bindgen-futures = { workspace = true } console_error_panic_hook = "0.1.7" serde = { version = "1.0.147", features = ["derive"] } @@ -19,4 +19,4 @@ tokio = { version = "1", features = ["full"] } warp = "0.3" [dev-dependencies] -wasm-bindgen-test = "0.3.36" +wasm-bindgen-test = { workspace = true }