From 4d4618d1eeea284ef8e175f881a09b9a11cc525f Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Tue, 22 Oct 2024 12:53:22 +0100 Subject: [PATCH 1/8] feat: Add features for dev and prod wasmer configurations --- .github/workflows/test.yml | 27 +++- Cargo.lock | 128 +++++++++++++++--- crates/host/Cargo.toml | 14 +- crates/host/src/module/wasmer_sys.rs | 11 +- flake.nix | 23 +++- ...-wasmer_sys.sh => bench-wasmer_sys_dev.sh} | 2 +- scripts/bench-wasmer_sys_prod.sh | 5 + scripts/bench.sh | 3 +- scripts/fuzz-wasmer_sys.sh | 2 +- scripts/fuzz-wasmer_sys_prod.sh | 5 + scripts/fuzz.sh | 3 +- ...t-wasmer_sys.sh => test-wasmer_sys_dev.sh} | 6 +- scripts/test-wasmer_sys_prod.sh | 23 ++++ scripts/test.sh | 3 +- test/Cargo.lock | 83 +++++++++++- test/Cargo.toml | 14 +- test/src/wasms.rs | 27 ++-- 17 files changed, 321 insertions(+), 58 deletions(-) rename scripts/{bench-wasmer_sys.sh => bench-wasmer_sys_dev.sh} (73%) create mode 100755 scripts/bench-wasmer_sys_prod.sh create mode 100755 scripts/fuzz-wasmer_sys_prod.sh rename scripts/{test-wasmer_sys.sh => test-wasmer_sys_dev.sh} (81%) create mode 100755 scripts/test-wasmer_sys_prod.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a227266c..6f5c619b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: matrix: script: ["test", "bench"] os: ["ubuntu-latest", "macos-latest"] - wasmer-feature: ["wasmer_sys", "wasmer_wamr"] + wasmer-feature: ["wasmer_sys_dev", "wasmer_sys_prod", "wasmer_wamr"] exclude: # TODO bench suite on macos-latest is killed by system due to running out of swap space # All benches run fine individually @@ -33,9 +33,9 @@ jobs: size: 15G - uses: actions/checkout@v4 - name: Install nix - uses: cachix/install-nix-action@v26 + uses: cachix/install-nix-action@v30 - name: Setup cachix - uses: cachix/cachix-action@v14 + uses: cachix/cachix-action@v15 if: ${{ ! contains(matrix.platform.runs-on, 'self-hosted') }} with: name: holochain-ci @@ -47,7 +47,8 @@ jobs: fail-fast: false matrix: wasmer-feature: - - "wasmer_sys" + - "wasmer_sys_dev" + - "wasmer_sys_prod" # TODO Building with wasmer_wamr feature flag on windows is not currently working. # See https://github.com/holochain/holochain-wasmer/issues/117 # - "wasmer_wamr" @@ -57,7 +58,21 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown + - name: Install LLVM + env: + LLVM_DIR: .llvm + shell: bash + run: | + LLVM_DIR=$(pwd)/${{ env.LLVM_DIR }} + mkdir -p ${LLVM_DIR} + curl --proto '=https' --tlsv1.2 -sSf "https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-windows-amd64.tar.xz" -L -o - | tar xJv -C ${LLVM_DIR} - name: test root - run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture + shell: pwsh + run: | + $env:LLVM_SYS_150_PREFIX="$(pwd)/.llvm" + cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test - run: cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture + shell: pwsh + run: | + $env:LLVM_SYS_150_PREFIX="$(pwd)/.llvm" + cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture diff --git a/Cargo.lock b/Cargo.lock index 8c31c5cd..d98c7e67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,7 +81,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide 0.7.4", - "object", + "object 0.36.3", "rustc-demangle", ] @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.6.0", "cexpr", @@ -1050,6 +1050,40 @@ dependencies = [ "serde", ] +[[package]] +name = "inkwell" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbac11e485159a525867fb7e6aa61981453e6a72f625fde6a4ab3047b0c6dec9" +dependencies = [ + "either", + "inkwell_internals", + "libc", + "llvm-sys", + "once_cell", + "parking_lot", +] + +[[package]] +name = "inkwell_internals" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d00c17e264ce02be5bc23d7bff959188ec7137beddd06b8b6b05a7c680ea85" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.1" @@ -1140,6 +1174,19 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" +[[package]] +name = "llvm-sys" +version = "150.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa55828745895d37233756307ded95a235b058aeb89cd12717ec7c3912089ee9" +dependencies = [ + "cc", + "lazy_static", + "libc", + "regex", + "semver", +] + [[package]] name = "lock_api" version = "0.4.12" @@ -1253,6 +1300,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "object" +version = "0.28.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +dependencies = [ + "memchr", +] + [[package]] name = "object" version = "0.36.3" @@ -1469,9 +1525,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1481,9 +1537,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1492,9 +1548,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "region" @@ -1596,6 +1652,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.34" @@ -1611,9 +1676,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "log", "once_cell", @@ -1626,15 +1691,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -2135,9 +2200,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" @@ -2283,6 +2348,7 @@ dependencies = [ "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", + "wasmer-compiler-llvm", "wasmer-derive", "wasmer-types", "wasmer-vm", @@ -2338,6 +2404,30 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-compiler-llvm" +version = "4.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86da768569a3b509285e486a93a3058b4837668c9c7fb54d7d208469fb06f028" +dependencies = [ + "byteorder", + "cc", + "inkwell", + "itertools 0.10.5", + "lazy_static", + "libc", + "object 0.28.4", + "rayon", + "regex", + "rustc_version", + "semver", + "smallvec", + "target-lexicon", + "wasmer-compiler", + "wasmer-types", + "wasmer-vm", +] + [[package]] name = "wasmer-config" version = "0.4.0" @@ -2495,9 +2585,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] diff --git a/crates/host/Cargo.toml b/crates/host/Cargo.toml index dbd29d6a..994ac7d1 100644 --- a/crates/host/Cargo.toml +++ b/crates/host/Cargo.toml @@ -7,8 +7,8 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -wasmer = { version = "=4.3.6", optional = true, default-feature = false } -wasmer-middlewares = { version = "=4.3.6", optional = true, default-feature = false } +wasmer = { version = "=4.3.6", optional = true, default-features = false } +wasmer-middlewares = { version = "=4.3.6", optional = true, default-features = false } # Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } @@ -30,14 +30,22 @@ crate-type = ["cdylib", "rlib"] path = "src/lib.rs" [features] -default = ["error_as_host", "wasmer_sys"] +default = ["error_as_host", "wasmer_sys_dev"] debug_memory = [] error_as_host = ["holochain_wasmer_common/error_as_host"] wasmer_sys = [ "dep:wasmer", "dep:wasmer-middlewares", + "wasmer/sys", +] +wasmer_sys_dev = [ + "wasmer_sys", "wasmer/default", ] +wasmer_sys_prod = [ + "wasmer_sys", + "wasmer/llvm", +] wasmer_wamr = [ "dep:hc-wasmer", "hc-wasmer/wamr" diff --git a/crates/host/src/module/wasmer_sys.rs b/crates/host/src/module/wasmer_sys.rs index 2778e918..2eadd709 100644 --- a/crates/host/src/module/wasmer_sys.rs +++ b/crates/host/src/module/wasmer_sys.rs @@ -5,7 +5,6 @@ use wasmer::sys::BaseTunables; use wasmer::sys::CompilerConfig; use wasmer::wasmparser; use wasmer::CompileError; -use wasmer::Cranelift; use wasmer::DeserializeError; use wasmer::Engine; use wasmer::Module; @@ -29,9 +28,15 @@ pub fn make_engine() -> Engine { // @todo 100 giga-ops is totally arbitrary cutoff so we probably // want to make the limit configurable somehow. let metering = Arc::new(Metering::new(WASM_METERING_LIMIT, cost_function)); + // the only place where the wasm compiler engine is set - let mut compiler = Cranelift::default(); - compiler.canonicalize_nans(true).push_middleware(metering); + #[cfg(feature = "wasmer_sys_dev")] + let mut compiler = wasmer::Cranelift::default(); + #[cfg(feature = "wasmer_sys_prod")] + let mut compiler = wasmer::LLVM::default(); + + compiler.canonicalize_nans(true); + compiler.push_middleware(metering); // Workaround for invalid memory access on iOS. // https://github.com/holochain/holochain/issues/3096 diff --git a/flake.nix b/flake.nix index efd75ec6..98974d5c 100644 --- a/flake.nix +++ b/flake.nix @@ -21,13 +21,26 @@ inputs.holochain-flake.devShells.${system}.rustDev ]; - # These packages and env vars are required to build wasmer on the 'wamr' branch (i.e. the hc-wasmer dependency) - packages = [ - pkgs.cmake - pkgs.clang - pkgs.llvmPackages.libclang.lib + packages = with pkgs; [ + # These packages and env vars are required to build Wasmer with the 'wamr' feature (i.e. the hc-wasmer dependency) + cmake + clang + llvmPackages.libclang.lib + # These packages are required to build Wasmer with the production config + llvm_15 + libffi + libxml2 + zlib + ncurses ]; + # Used by `wamr` LIBCLANG_PATH="${pkgs.llvmPackages.libclang.lib}/lib"; + # Used by wasmer production config + shellHook = '' + # This binary lives in a different derivation to `llvm_15` and isn't re-exported through that derivation + export LLVM_SYS_150_PREFIX=$(which llvm-config | xargs dirname | xargs dirname) + export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.libffi}/lib:${pkgs.zlib}/lib:${pkgs.ncurses}/lib" + ''; }; }; }; diff --git a/scripts/bench-wasmer_sys.sh b/scripts/bench-wasmer_sys_dev.sh similarity index 73% rename from scripts/bench-wasmer_sys.sh rename to scripts/bench-wasmer_sys_dev.sh index 63909ae5..ab6ded2c 100755 --- a/scripts/bench-wasmer_sys.sh +++ b/scripts/bench-wasmer_sys_dev.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash ( cd test && \ - cargo bench --no-default-features --features wasmer_sys + cargo bench --no-default-features --features wasmer_sys_dev ) # it's possible to flamegraph the benchmarks like this: diff --git a/scripts/bench-wasmer_sys_prod.sh b/scripts/bench-wasmer_sys_prod.sh new file mode 100755 index 00000000..fd73eced --- /dev/null +++ b/scripts/bench-wasmer_sys_prod.sh @@ -0,0 +1,5 @@ +#! /usr/bin/env bash +( + cd test && \ + cargo bench --no-default-features --features wasmer_sys_prod +) diff --git a/scripts/bench.sh b/scripts/bench.sh index ec8a8bb4..3dad9a66 100644 --- a/scripts/bench.sh +++ b/scripts/bench.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash -./bench-wasmer_sys.sh && \ +./bench-wasmer_sys_dev.sh +./bench-wasmer_sys_prod.sh ./bench-wasmer_wamr.sh \ No newline at end of file diff --git a/scripts/fuzz-wasmer_sys.sh b/scripts/fuzz-wasmer_sys.sh index 80472e81..f6832e9f 100755 --- a/scripts/fuzz-wasmer_sys.sh +++ b/scripts/fuzz-wasmer_sys.sh @@ -2,4 +2,4 @@ cargo test cargo test --manifest-path test/Cargo.toml -cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_sys \ No newline at end of file +cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_sys_dev diff --git a/scripts/fuzz-wasmer_sys_prod.sh b/scripts/fuzz-wasmer_sys_prod.sh new file mode 100755 index 00000000..5a9d3a4b --- /dev/null +++ b/scripts/fuzz-wasmer_sys_prod.sh @@ -0,0 +1,5 @@ +#! /usr/bin/env bash +cargo test +cargo test --manifest-path test/Cargo.toml + +cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_sys_prod diff --git a/scripts/fuzz.sh b/scripts/fuzz.sh index c2b47543..814a1053 100644 --- a/scripts/fuzz.sh +++ b/scripts/fuzz.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash -./fuzz-wasmer_sys.sh && \ +./fuzz-wasmer_sys_dev.sh +./fuzz-wasmer_sys_prod.sh ./fuzz-wasmer_wamr.sh \ No newline at end of file diff --git a/scripts/test-wasmer_sys.sh b/scripts/test-wasmer_sys_dev.sh similarity index 81% rename from scripts/test-wasmer_sys.sh rename to scripts/test-wasmer_sys_dev.sh index e748cad9..80dd2bcd 100755 --- a/scripts/test-wasmer_sys.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -14,10 +14,10 @@ cargo clippy ( cd crates/guest && cargo clippy --target wasm32-unknown-unknown ) # tests the root workspace that doesn't include any wasm code -cargo test --no-default-features --features error_as_host,wasmer_sys ${1-} -- --nocapture +cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture # test that everything builds cargo build --release --manifest-path test/test_wasm/Cargo.toml --target wasm32-unknown-unknown -# build wasm and run the "full" tests for wasmer_sys -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys ${1-} -- --nocapture +# build wasm and run the "full" tests for wasmer_sys_dev +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys_dev ${1-} -- --nocapture diff --git a/scripts/test-wasmer_sys_prod.sh b/scripts/test-wasmer_sys_prod.sh new file mode 100755 index 00000000..885eb3a7 --- /dev/null +++ b/scripts/test-wasmer_sys_prod.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -euxo pipefail + +export RUST_BACKTRACE=full +export WASMER_BACKTRACE=1 + +# static tests +cargo fmt +( cd test && cargo fmt --check ) +( cd crates/guest && cargo fmt --check ) + +cargo clippy +( cd test && cargo clippy ) +( cd crates/guest && cargo clippy --target wasm32-unknown-unknown ) + +# tests the root workspace that doesn't include any wasm code +cargo test --no-default-features --features error_as_host,wasmer_sys_prod ${1-} -- --nocapture + +# test that everything builds +cargo build --release --manifest-path test/test_wasm/Cargo.toml --target wasm32-unknown-unknown + +# build wasm and run the "full" tests for wasmer_sys_prod +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys_prod ${1-} -- --nocapture diff --git a/scripts/test.sh b/scripts/test.sh index 30908fcb..f27eaeba 100644 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash -./test-wasmer_sys.sh && \ +./test-wasmer_sys_dev.sh +./test-wasmer_sys_prod.sh ./test-wasmer_wamr.sh \ No newline at end of file diff --git a/test/Cargo.lock b/test/Cargo.lock index cbb07f9e..61361628 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -98,7 +98,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.35.0", "rustc-demangle", ] @@ -1224,6 +1224,31 @@ dependencies = [ "serde", ] +[[package]] +name = "inkwell" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbac11e485159a525867fb7e6aa61981453e6a72f625fde6a4ab3047b0c6dec9" +dependencies = [ + "either", + "inkwell_internals", + "libc", + "llvm-sys", + "once_cell", + "parking_lot", +] + +[[package]] +name = "inkwell_internals" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d00c17e264ce02be5bc23d7bff959188ec7137beddd06b8b6b05a7c680ea85" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "is-terminal" version = "0.4.12" @@ -1314,6 +1339,19 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" +[[package]] +name = "llvm-sys" +version = "150.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa55828745895d37233756307ded95a235b058aeb89cd12717ec7c3912089ee9" +dependencies = [ + "cc", + "lazy_static", + "libc", + "regex", + "semver", +] + [[package]] name = "lock_api" version = "0.4.12" @@ -1418,6 +1456,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "object" +version = "0.28.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +dependencies = [ + "memchr", +] + [[package]] name = "object" version = "0.35.0" @@ -1801,6 +1848,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.34" @@ -2580,6 +2636,7 @@ dependencies = [ "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", + "wasmer-compiler-llvm", "wasmer-derive", "wasmer-types", "wasmer-vm", @@ -2635,6 +2692,30 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-compiler-llvm" +version = "4.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86da768569a3b509285e486a93a3058b4837668c9c7fb54d7d208469fb06f028" +dependencies = [ + "byteorder", + "cc", + "inkwell", + "itertools 0.10.5", + "lazy_static", + "libc", + "object 0.28.4", + "rayon", + "regex", + "rustc_version", + "semver", + "smallvec", + "target-lexicon", + "wasmer-compiler", + "wasmer-types", + "wasmer-vm", +] + [[package]] name = "wasmer-config" version = "0.2.0" diff --git a/test/Cargo.toml b/test/Cargo.toml index 5d34c246..dd9d380d 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -42,12 +42,20 @@ debug = true [features] debug_memory = ["holochain_wasmer_host/debug_memory"] -default = ["wasmer_sys"] +default = ["wasmer_sys_dev"] wasmer_sys = [ "dep:wasmer", - "dep:wasmer-middlewares", + "dep:wasmer-middlewares", + "wasmer/sys", +] +wasmer_sys_dev = [ + "wasmer_sys", "wasmer/default", - "holochain_wasmer_host/wasmer_sys" + "holochain_wasmer_host/wasmer_sys_dev" +] +wasmer_sys_prod = [ + "wasmer_sys", + "holochain_wasmer_host/wasmer_sys_prod" ] wasmer_wamr = [ "dep:hc-wasmer", diff --git a/test/src/wasms.rs b/test/src/wasms.rs index 9d90a217..9f9146fc 100644 --- a/test/src/wasms.rs +++ b/test/src/wasms.rs @@ -10,8 +10,6 @@ use wasmer::wasmparser::Operator; use wasmer::AsStoreMut; #[cfg(feature = "wasmer_sys")] use wasmer::CompilerConfig; -#[cfg(feature = "wasmer_sys")] -use wasmer::Cranelift; use wasmer::Engine; use wasmer::FunctionEnv; use wasmer::Imports; @@ -92,15 +90,24 @@ impl TestWasm { let cranelift_fn = || { let cost_function = |_operator: &Operator| -> u64 { 1 }; let metering = Arc::new(Metering::new(10_000_000_000, cost_function)); - let mut cranelift = Cranelift::default(); - cranelift.canonicalize_nans(true).push_middleware(metering); - Engine::from(cranelift) + #[cfg(feature = "wasmer_sys_dev")] + let mut compiler = wasmer::Cranelift::default(); + #[cfg(feature = "wasmer_sys_prod")] + let mut compiler = wasmer::LLVM::default(); + + compiler.canonicalize_nans(true); + compiler.push_middleware(metering); + Engine::from(compiler) }; - let cranelift_fn_unmetered = || { - let mut cranelift = Cranelift::default(); - cranelift.canonicalize_nans(true); - Engine::from(cranelift) + let compiler_fn_unmetered = || { + #[cfg(feature = "wasmer_sys_dev")] + let mut compiler = wasmer::Cranelift::default(); + #[cfg(feature = "wasmer_sys_prod")] + let mut compiler = wasmer::LLVM::default(); + + compiler.canonicalize_nans(true); + Engine::from(compiler) }; // This will error if the cache is already initialized @@ -111,7 +118,7 @@ impl TestWasm { if metered { cranelift_fn } else { - cranelift_fn_unmetered + compiler_fn_unmetered }, None, ), From 8c6751e1543a1b1fcf3057a4ebd9593c42c52556 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Fri, 25 Oct 2024 15:02:38 +0100 Subject: [PATCH 2/8] Fix fuzz scripts, although fuzzing doesn't just work --- scripts/{fuzz-wasmer_sys.sh => fuzz-wasmer_sys_dev.sh} | 0 scripts/fuzz.sh | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename scripts/{fuzz-wasmer_sys.sh => fuzz-wasmer_sys_dev.sh} (100%) mode change 100644 => 100755 scripts/fuzz.sh diff --git a/scripts/fuzz-wasmer_sys.sh b/scripts/fuzz-wasmer_sys_dev.sh similarity index 100% rename from scripts/fuzz-wasmer_sys.sh rename to scripts/fuzz-wasmer_sys_dev.sh diff --git a/scripts/fuzz.sh b/scripts/fuzz.sh old mode 100644 new mode 100755 index 814a1053..5b37c563 --- a/scripts/fuzz.sh +++ b/scripts/fuzz.sh @@ -1,5 +1,5 @@ #! /usr/bin/env bash -./fuzz-wasmer_sys_dev.sh -./fuzz-wasmer_sys_prod.sh -./fuzz-wasmer_wamr.sh \ No newline at end of file +./scripts/fuzz-wasmer_sys_dev.sh +./scripts/fuzz-wasmer_sys_prod.sh +./scripts/fuzz-wasmer_wamr.sh \ No newline at end of file From 723295d14b59b4bd637a2bb2a9fd60e739923292 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Wed, 30 Oct 2024 18:23:53 +0000 Subject: [PATCH 3/8] Format check, rather than actually formatting --- scripts/test-wasmer_sys_dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-wasmer_sys_dev.sh b/scripts/test-wasmer_sys_dev.sh index 80dd2bcd..619d337d 100755 --- a/scripts/test-wasmer_sys_dev.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -5,7 +5,7 @@ export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 # static tests -cargo fmt +cargo fmt --check ( cd test && cargo fmt --check ) ( cd crates/guest && cargo fmt --check ) From abff424e53be109740d1e257b7f30852d1ac2799 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Wed, 30 Oct 2024 18:37:30 +0000 Subject: [PATCH 4/8] Fix lint checking and then lint issues --- crates/host/src/plru.rs | 4 ---- scripts/test-wasmer_sys_dev.sh | 6 +++--- scripts/test-wasmer_sys_prod.sh | 9 --------- test/wasm_empty/src/wasm.rs | 3 ++- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/crates/host/src/plru.rs b/crates/host/src/plru.rs index 3742b033..19c588c4 100644 --- a/crates/host/src/plru.rs +++ b/crates/host/src/plru.rs @@ -77,8 +77,6 @@ //! ✔ Idiomatic Rust //! //! ✔ Production-quality - -#![cfg_attr(feature = "no_std", no_std)] #![warn(missing_docs)] extern crate core; @@ -105,7 +103,6 @@ pub type DynamicCache = Cache>; /// Create a heap allocated cache of a fixed (but dynamic) number of cache lines. /// /// Ideally, 64 should divide `len` to optimize space efficiency. -#[cfg(not(feature = "no_std"))] pub fn create(lines: usize) -> DynamicCache { // Unfortunately, `AtomicU64` doesn't implement `Clone`, so we cannot use the `vec![]` macro. // We need to manually construct our vector. @@ -312,7 +309,6 @@ impl> fmt::Debug for Cache { #[cfg(test)] mod tests { #[test] - #[cfg(not(feature = "no_std"))] fn create() { assert_eq!(super::create(10).len(), 64); assert_eq!(super::create(64).len(), 64); diff --git a/scripts/test-wasmer_sys_dev.sh b/scripts/test-wasmer_sys_dev.sh index 619d337d..fcaf35da 100755 --- a/scripts/test-wasmer_sys_dev.sh +++ b/scripts/test-wasmer_sys_dev.sh @@ -9,9 +9,9 @@ cargo fmt --check ( cd test && cargo fmt --check ) ( cd crates/guest && cargo fmt --check ) -cargo clippy -( cd test && cargo clippy ) -( cd crates/guest && cargo clippy --target wasm32-unknown-unknown ) +cargo clippy -- --deny warnings +( cd test && cargo clippy -- --deny warnings ) +( cd crates/guest && cargo clippy --target wasm32-unknown-unknown -- --deny warnings ) # tests the root workspace that doesn't include any wasm code cargo test --no-default-features --features error_as_host,wasmer_sys_dev ${1-} -- --nocapture diff --git a/scripts/test-wasmer_sys_prod.sh b/scripts/test-wasmer_sys_prod.sh index 885eb3a7..b36be088 100755 --- a/scripts/test-wasmer_sys_prod.sh +++ b/scripts/test-wasmer_sys_prod.sh @@ -4,15 +4,6 @@ set -euxo pipefail export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 -# static tests -cargo fmt -( cd test && cargo fmt --check ) -( cd crates/guest && cargo fmt --check ) - -cargo clippy -( cd test && cargo clippy ) -( cd crates/guest && cargo clippy --target wasm32-unknown-unknown ) - # tests the root workspace that doesn't include any wasm code cargo test --no-default-features --features error_as_host,wasmer_sys_prod ${1-} -- --nocapture diff --git a/test/wasm_empty/src/wasm.rs b/test/wasm_empty/src/wasm.rs index b60bbdb9..22eba27a 100644 --- a/test/wasm_empty/src/wasm.rs +++ b/test/wasm_empty/src/wasm.rs @@ -1,2 +1,3 @@ +#![allow(unused_imports)] use holochain_wasmer_guest::allocation::__hc__allocate_1; -use holochain_wasmer_guest::allocation::__hc__deallocate_1; \ No newline at end of file +use holochain_wasmer_guest::allocation::__hc__deallocate_1; From 0d499c8455ac157559bbb722254e7afe3974eb5f Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Wed, 30 Oct 2024 18:43:56 +0000 Subject: [PATCH 5/8] Fix another lint issue --- test/test_wasm/src/wasm.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_wasm/src/wasm.rs b/test/test_wasm/src/wasm.rs index 4128dbfc..5ae52acc 100644 --- a/test/test_wasm/src/wasm.rs +++ b/test/test_wasm/src/wasm.rs @@ -67,7 +67,7 @@ pub extern "C" fn process_native(guest_ptr: usize, len: usize) -> DoubleUSize { Err(err_ptr) => return err_ptr, }; let processed: SomeStruct = try_ptr!( - host_call(__hc__test_process_struct_2, &input), + host_call(__hc__test_process_struct_2, input), "could not deserialize SomeStruct in process_native" ); return_ptr(processed) From f9d4542e73e61b1243c5014d76643bdc8e0e003c Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Wed, 30 Oct 2024 19:27:02 +0000 Subject: [PATCH 6/8] Update changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc8dca17..acfe364b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### Changed +- **BREAKING CHANGE** The `wasmer_sys` has been renamed to `wasmer_sys_dev` + +### Added +- A new feature flag, `wasmer_sys_prod` which enables the Wasmer LLVM compiler. The default, with the `wasmer_sys_dev` feature + is the Cranelift compiler. The Cranelift compiler is fast, and recommended for development, but the LLVM compiler is supposed + to be faster and more optimized for production. In testing so far, the compile step is slower with LLVM but the runtime is + faster. More testing is needed yet to confirm the difference. + ## [0.0.93] - 2024-04-24 ### Changed From 1f6cb88b4dcc5dbf17e64c48859e002be79e2011 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Thu, 31 Oct 2024 10:50:27 +0000 Subject: [PATCH 7/8] Update CHANGELOG.md Co-authored-by: Callum Dunster --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acfe364b..eaf41d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] ### Changed -- **BREAKING CHANGE** The `wasmer_sys` has been renamed to `wasmer_sys_dev` +- **BREAKING CHANGE** The `wasmer_sys` feature has been renamed to `wasmer_sys_dev` ### Added - A new feature flag, `wasmer_sys_prod` which enables the Wasmer LLVM compiler. The default, with the `wasmer_sys_dev` feature From b7eb114924ec92bcd22642fe7f03de513bc3cb51 Mon Sep 17 00:00:00 2001 From: mattyg Date: Tue, 26 Nov 2024 20:35:52 -0800 Subject: [PATCH 8/8] Build/wasmer 5 bump (#126) * build: bump wasmer to 5.x * build: update flake lock * fix: remove hc_wasmer imports * build: nix deps required for building wasmer 5.x * build: cargo lock * doc: changelog * ci: bump llvm to v18 for windows tests * build: bump wasmer 5.0.2 --------- Co-authored-by: Macbookair --- .github/workflows/test.yml | 6 +- CHANGELOG.md | 2 + Cargo.lock | 1186 +++++++++++++++------------------ crates/host/Cargo.toml | 11 +- crates/host/src/lib.rs | 4 - flake.lock | 169 ++--- flake.nix | 7 +- test/Cargo.lock | 1264 ++++++++++++++++-------------------- test/Cargo.toml | 13 +- test/benches/bench.rs | 4 - test/src/test.rs | 4 - 11 files changed, 1127 insertions(+), 1543 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f5c619b..12b8d48c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,14 +65,14 @@ jobs: run: | LLVM_DIR=$(pwd)/${{ env.LLVM_DIR }} mkdir -p ${LLVM_DIR} - curl --proto '=https' --tlsv1.2 -sSf "https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-windows-amd64.tar.xz" -L -o - | tar xJv -C ${LLVM_DIR} + curl --proto '=https' --tlsv1.2 -sSf "https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-windows-amd64.tar.xz" -L -o - | tar xJv -C ${LLVM_DIR} - name: test root shell: pwsh run: | - $env:LLVM_SYS_150_PREFIX="$(pwd)/.llvm" + $env:LLVM_SYS_180_PREFIX="$(pwd)/.llvm" cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test shell: pwsh run: | - $env:LLVM_SYS_150_PREFIX="$(pwd)/.llvm" + $env:LLVM_SYS_180_PREFIX="$(pwd)/.llvm" cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf41d9f..82fb7638 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] ### Changed + +- Upgrade wasmer to 5.x - **BREAKING CHANGE** The `wasmer_sys` feature has been renamed to `wasmer_sys_dev` ### Added diff --git a/Cargo.lock b/Cargo.lock index d98c7e67..5fa2063b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,15 +23,27 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" -version = "0.7.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -58,12 +70,6 @@ dependencies = [ "derive_arbitrary", ] -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - [[package]] name = "autocfg" version = "1.3.0" @@ -108,16 +114,14 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.5" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -126,7 +130,6 @@ dependencies = [ "rustc-hash", "shlex", "syn 2.0.75", - "which", ] [[package]] @@ -141,18 +144,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -174,8 +165,20 @@ version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ - "bytecheck_derive", - "ptr_meta", + "bytecheck_derive 0.6.12", + "ptr_meta 0.1.4", + "simdutf8", +] + +[[package]] +name = "bytecheck" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f" +dependencies = [ + "bytecheck_derive 0.8.0", + "ptr_meta 0.3.0", + "rancor", "simdutf8", ] @@ -190,6 +193,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bytecheck_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -201,17 +215,26 @@ name = "bytes" version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ - "serde", + "bzip2-sys", + "libc", ] [[package]] -name = "bytesize" -version = "1.3.0" +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" dependencies = [ - "serde", + "cc", + "libc", + "pkg-config", ] [[package]] @@ -252,6 +275,8 @@ version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ + "jobserver", + "libc", "shlex", ] @@ -270,6 +295,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clang-sys" version = "1.8.1" @@ -290,17 +325,23 @@ dependencies = [ "cc", ] +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "corosensei" -version = "0.1.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" +checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437" dependencies = [ "autocfg", "cfg-if", "libc", "scopeguard", - "windows-sys 0.33.0", + "windows-sys 0.59.0", ] [[package]] @@ -314,74 +355,80 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115" +checksum = "305d51c180ebdc46ef61bc60c54ae6512db3bc9a05842a1f1e762e45977019ab" dependencies = [ "cranelift-entity", ] +[[package]] +name = "cranelift-bitset" +version = "0.110.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "690d8ae6c73748e5ce3d8fe59034dceadb8823e6c8994ba324141c5eae909b0e" + [[package]] name = "cranelift-codegen" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" +checksum = "bd7ca95e831c18d1356da783765c344207cbdffea91e13e47fa9327dbb2e0719" dependencies = [ - "arrayvec", "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-egraph", + "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", + "gimli 0.28.1", + "hashbrown 0.14.5", "log", "regalloc2", + "rustc-hash", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.91.1" +version = "0.110.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74" +checksum = "f0a2d2ab65e6cbf91f81781d8da65ec2005510f18300eff21a99526ed6785863" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.91.1" +version = "0.110.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7" +checksum = "efcff860573cf3db9ae98fbd949240d78b319df686cc306872e7fab60e9c84d7" [[package]] -name = "cranelift-egraph" -version = "0.91.1" +name = "cranelift-control" +version = "0.110.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73" +checksum = "69d70e5b75c2d5541ef80a99966ccd97aaa54d2a6af19ea31759a28538e1685a" dependencies = [ - "cranelift-entity", - "fxhash", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "log", - "smallvec", + "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c" +checksum = "a48cb0a194c9ba82fec35a1e492055388d89b2e3c03dee9dcf2488892be8004d" +dependencies = [ + "cranelift-bitset", +] [[package]] name = "cranelift-frontend" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" +checksum = "8327afc6c1c05f4be62fefce5b439fa83521c65363a322e86ea32c85e7ceaf64" dependencies = [ "cranelift-codegen", "log", @@ -391,9 +438,24 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.91.1" +version = "0.110.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b08621c00321efcfa3eee6a3179adc009e21ea8d24ca7adc3c326184bc3f48" + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" @@ -448,38 +510,14 @@ dependencies = [ "typenum", ] -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - [[package]] name = "darling" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -492,28 +530,17 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.75", ] -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.10", + "darling_core", "quote", "syn 2.0.75", ] @@ -533,14 +560,18 @@ dependencies = [ ] [[package]] -name = "derivative" -version = "2.2.0" +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + +[[package]] +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "powerfmt", ] [[package]] @@ -555,34 +586,14 @@ dependencies = [ ] [[package]] -name = "derive_builder" -version = "0.12.0" +name = "derive_more" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", + "syn 2.0.75", ] [[package]] @@ -593,6 +604,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -606,21 +618,6 @@ dependencies = [ "syn 2.0.75", ] -[[package]] -name = "document-features" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" -dependencies = [ - "litrs", -] - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - [[package]] name = "either" version = "1.13.0" @@ -662,7 +659,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro2", "quote", "syn 2.0.75", @@ -686,15 +683,9 @@ dependencies = [ [[package]] name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fastrand" -version = "2.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "filetime" @@ -733,21 +724,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -773,12 +749,12 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 1.9.3", + "indexmap 2.4.0", "stable_deref_trait", ] @@ -795,16 +771,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "half" -version = "1.8.3" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ "ahash", ] @@ -814,126 +790,8 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "hc-wasmer" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" -dependencies = [ - "bindgen", - "bytes", - "cfg-if", - "cmake", - "derivative", - "hc-wasmer-compiler", - "hc-wasmer-derive", - "hc-wasmer-types", - "hc-wasmer-vm", - "indexmap 1.9.3", - "js-sys", - "more-asserts", - "rustc-demangle", - "serde", - "serde-wasm-bindgen", - "shared-buffer", - "target-lexicon", - "thiserror", - "tracing", - "ureq", - "wasm-bindgen", - "wasmparser", - "wat", - "windows-sys 0.59.0", - "zip", -] - -[[package]] -name = "hc-wasmer-compiler" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" -dependencies = [ - "backtrace", - "bytes", - "cfg-if", - "enum-iterator", - "enumset", - "hc-wasmer-types", - "hc-wasmer-vm", - "lazy_static", - "leb128", - "libc", - "memmap2 0.5.10", - "more-asserts", - "region", - "rkyv", - "self_cell", - "shared-buffer", - "smallvec", - "thiserror", - "windows-sys 0.59.0", - "xxhash-rust", -] - -[[package]] -name = "hc-wasmer-derive" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "hc-wasmer-types" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" -dependencies = [ - "bytecheck", - "enum-iterator", - "enumset", - "getrandom", - "hex", - "indexmap 1.9.3", - "more-asserts", - "rkyv", - "sha2", - "target-lexicon", - "thiserror", - "xxhash-rust", -] - -[[package]] -name = "hc-wasmer-vm" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" -dependencies = [ - "backtrace", - "cc", - "cfg-if", - "corosensei", - "crossbeam-queue", - "dashmap", - "derivative", - "enum-iterator", - "fnv", - "hc-wasmer-types", - "indexmap 1.9.3", - "lazy_static", - "libc", - "mach2", - "memoffset", - "more-asserts", - "region", - "scopeguard", - "thiserror", - "windows-sys 0.59.0", + "ahash", ] [[package]] @@ -948,6 +806,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "holochain_serialized_bytes" version = "0.0.55" @@ -990,7 +857,6 @@ version = "0.0.96" dependencies = [ "bimap", "bytes", - "hc-wasmer", "hex", "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1003,15 +869,6 @@ dependencies = [ "wasmer-middlewares", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1036,7 +893,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -1047,32 +903,40 @@ checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", - "serde", ] [[package]] name = "inkwell" -version = "0.1.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbac11e485159a525867fb7e6aa61981453e6a72f625fde6a4ab3047b0c6dec9" +checksum = "40fb405537710d51f6bdbc8471365ddd4cd6d3a3c3ad6e0c8291691031ba94b2" dependencies = [ "either", "inkwell_internals", "libc", "llvm-sys", "once_cell", - "parking_lot", + "thiserror", ] [[package]] name = "inkwell_internals" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d00c17e264ce02be5bc23d7bff959188ec7137beddd06b8b6b05a7c680ea85" +checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.75", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", ] [[package]] @@ -1108,6 +972,15 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.70" @@ -1123,12 +996,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leb128" version = "0.2.5" @@ -1137,9 +1004,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libloading" @@ -1168,22 +1035,17 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - [[package]] name = "llvm-sys" -version = "150.2.1" +version = "180.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa55828745895d37233756307ded95a235b058aeb89cd12717ec7c3912089ee9" +checksum = "778fa5fa02e32728e718f11eec147e6f134137399ab02fd2c13d32476337affa" dependencies = [ + "anyhow", "cc", "lazy_static", "libc", - "regex", + "regex-lite", "semver", ] @@ -1209,6 +1071,27 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "mach2" version = "0.4.2" @@ -1224,15 +1107,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.6.2" @@ -1281,6 +1155,26 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" +[[package]] +name = "munge" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", +] + [[package]] name = "nom" version = "7.1.3" @@ -1291,6 +1185,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-traits" version = "0.2.19" @@ -1302,13 +1202,27 @@ dependencies = [ [[package]] name = "object" -version = "0.28.4" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "crc32fast", + "flate2", + "hashbrown 0.14.5", + "indexmap 2.4.0", + "memchr", + "ruzstd", +] + [[package]] name = "object" version = "0.36.3" @@ -1353,6 +1267,16 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -1365,6 +1289,18 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -1385,27 +1321,25 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.75", ] [[package]] @@ -1423,18 +1357,38 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "ptr_meta_derive", + "ptr_meta_derive 0.1.4", +] + +[[package]] +name = "ptr_meta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90" +dependencies = [ + "ptr_meta_derive 0.3.0", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] name = "ptr_meta_derive" -version = "0.1.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.75", ] [[package]] @@ -1447,10 +1401,13 @@ dependencies = [ ] [[package]] -name = "radium" -version = "0.7.0" +name = "rancor" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947" +dependencies = [ + "ptr_meta 0.3.0", +] [[package]] name = "rand" @@ -1513,12 +1470,13 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.5.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ - "fxhash", + "hashbrown 0.13.2", "log", + "rustc-hash", "slice-group-by", "smallvec", ] @@ -1546,6 +1504,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" version = "0.8.5" @@ -1566,11 +1530,11 @@ dependencies = [ [[package]] name = "rend" -version = "0.4.2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" dependencies = [ - "bytecheck", + "bytecheck 0.8.0", ] [[package]] @@ -1590,32 +1554,32 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.45" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +checksum = "395027076c569819ea6035ee62e664f5e03d74e281744f55261dd1afd939212b" dependencies = [ - "bitvec", - "bytecheck", + "bytecheck 0.8.0", "bytes", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "ptr_meta", + "hashbrown 0.14.5", + "indexmap 2.4.0", + "munge", + "ptr_meta 0.3.0", + "rancor", "rend", "rkyv_derive", - "seahash", "tinyvec", "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.45" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.75", ] [[package]] @@ -1707,35 +1671,21 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "schemars" -version = "0.8.21" +name = "ruzstd" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", - "url", + "byteorder", + "derive_more", + "twox-hash", ] [[package]] -name = "schemars_derive" -version = "0.8.21" +name = "ryu" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.75", -] +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -1743,12 +1693,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "self_cell" version = "1.0.4" @@ -1802,16 +1746,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.203" @@ -1823,17 +1757,6 @@ dependencies = [ "syn 2.0.75", ] -[[package]] -name = "serde_derive_internals" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - [[package]] name = "serde_json" version = "1.0.125" @@ -1847,28 +1770,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.4.0", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha1" version = "0.10.6" @@ -1898,7 +1799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" dependencies = [ "bytes", - "memmap2 0.6.2", + "memmap2", ] [[package]] @@ -1944,10 +1845,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "strsim" -version = "0.10.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" @@ -1983,17 +1884,11 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tar" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -2006,19 +1901,6 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - [[package]] name = "test-fuzz" version = "6.0.0" @@ -2048,7 +1930,7 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e6b4c7391a38f0f026972ec2200bcfd1ec45533aa266fdae5858d011afc500" dependencies = [ - "darling 0.20.10", + "darling", "heck", "itertools 0.13.0", "once_cell", @@ -2092,53 +1974,38 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.8.0" +name = "time" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ - "tinyvec_macros", + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", ] [[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.8.19" +name = "time-core" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] -name = "toml_datetime" -version = "0.6.8" +name = "tinyvec" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ - "serde", + "tinyvec_macros", ] [[package]] -name = "toml_edit" -version = "0.22.20" +name = "tinyvec_macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap 2.4.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tracing" @@ -2171,6 +2038,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + [[package]] name = "typenum" version = "1.17.0" @@ -2204,12 +2081,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.9.0" @@ -2241,7 +2112,6 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] @@ -2319,22 +2189,23 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-encoder" -version = "0.32.0" +version = "0.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" +checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88" dependencies = [ "leb128", ] [[package]] name = "wasmer" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be5fa49d7d97f83e095f090dcc178d923f2970f588443283cd7a94974ab8cbe" +checksum = "9817a0dd105a992d9f3e8831370acddbdf3848e5357086a569dc4fb07c2aa57d" dependencies = [ + "bindgen", "bytes", "cfg-if", - "derivative", + "cmake", "indexmap 1.9.3", "js-sys", "more-asserts", @@ -2342,9 +2213,11 @@ dependencies = [ "serde", "serde-wasm-bindgen", "shared-buffer", + "tar", "target-lexicon", "thiserror", "tracing", + "ureq", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2352,15 +2225,18 @@ dependencies = [ "wasmer-derive", "wasmer-types", "wasmer-vm", + "wasmparser", "wat", "windows-sys 0.59.0", + "xz", + "zip", ] [[package]] name = "wasmer-compiler" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9696a040f935903db440078cd287c0288ab152394122de442fdd21b3eaa8cd2c" +checksum = "0261d34a6f61d666e4f954254cf486371117db3e8a875767c5e3f21e45eb43aa" dependencies = [ "backtrace", "bytes", @@ -2370,13 +2246,15 @@ dependencies = [ "lazy_static", "leb128", "libc", - "memmap2 0.5.10", + "memmap2", "more-asserts", + "object 0.32.2", "region", "rkyv", "self_cell", "shared-buffer", "smallvec", + "target-lexicon", "thiserror", "wasmer-types", "wasmer-vm", @@ -2387,14 +2265,15 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5959da148d41a5870d1b18a880e19353add47c0ca95e510061275ea467b6b44" +checksum = "fdc984c651c29e30ec4f6da82ca472b9d2dd50dfe4c9edd84628e59f876ea2d0" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "gimli 0.26.2", + "gimli 0.28.1", + "itertools 0.12.1", "more-asserts", "rayon", "smallvec", @@ -2406,9 +2285,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-llvm" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86da768569a3b509285e486a93a3058b4837668c9c7fb54d7d208469fb06f028" +checksum = "87659b36db0aa023c1dc292ec5b99c0df3e956ec1361acfe4a409faffa410c94" dependencies = [ "byteorder", "cc", @@ -2416,7 +2295,7 @@ dependencies = [ "itertools 0.10.5", "lazy_static", "libc", - "object 0.28.4", + "object 0.30.4", "rayon", "regex", "rustc_version", @@ -2428,35 +2307,13 @@ dependencies = [ "wasmer-vm", ] -[[package]] -name = "wasmer-config" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4a632496950fde9ad821e195ef1a301440076f7c7d80de55239a140359bcbd" -dependencies = [ - "anyhow", - "bytesize", - "derive_builder", - "hex", - "indexmap 2.4.0", - "schemars", - "semver", - "serde", - "serde_cbor", - "serde_json", - "serde_yaml", - "thiserror", - "toml", - "url", -] - [[package]] name = "wasmer-derive" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f448efbe12d656ba96d997c9e338f15cd80934c81f2286c2730cb9224d4e41d" +checksum = "7a2e5a149301403084c3198b68cd635b7f210e8d26f533218a7a68b6d20b441e" dependencies = [ - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 1.0.109", @@ -2464,9 +2321,9 @@ dependencies = [ [[package]] name = "wasmer-middlewares" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a3c1a7474e5abd75fe6bde4d34fee77c22261b45f157bb769d4a297749463c" +checksum = "b8c441261b0388b1dcb062474912e998f81ce2cd033e0fd9b97fa79917637b9f" dependencies = [ "wasmer", "wasmer-types", @@ -2475,30 +2332,29 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b383ef63005176be3bc2056d3b4078ae1497b324f573d79acbf81036f1c9ec" +checksum = "d09f305bc775871b551c5907facaadc8e7ddc0845b0ccd18ccb2c046d0f9b7f0" dependencies = [ - "bytecheck", + "bytecheck 0.6.12", "enum-iterator", "enumset", "getrandom", "hex", - "indexmap 1.9.3", + "indexmap 2.4.0", "more-asserts", "rkyv", "sha2", "target-lexicon", "thiserror", - "webc", "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c371597ec33248e775de641c7a475173fb60f2b5ea085c74d34cee9fad06b83" +checksum = "0ab1b03c3cb791e94f63a44377fe35936496d35230d8219a36af11b090940c99" dependencies = [ "backtrace", "cc", @@ -2506,10 +2362,9 @@ dependencies = [ "corosensei", "crossbeam-queue", "dashmap", - "derivative", "enum-iterator", "fnv", - "indexmap 1.9.3", + "indexmap 2.4.0", "lazy_static", "libc", "mach2", @@ -2524,21 +2379,24 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3" dependencies = [ + "ahash", "bitflags 2.6.0", + "hashbrown 0.14.5", "indexmap 2.4.0", "semver", ] [[package]] name = "wast" -version = "64.0.0" +version = "216.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" +checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08" dependencies = [ + "bumpalo", "leb128", "memchr", "unicode-width", @@ -2547,42 +2405,13 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.71" +version = "1.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" +checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a" dependencies = [ "wast", ] -[[package]] -name = "webc" -version = "6.0.0-rc2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3e2ccb43d303c5bd48f31db7a129481a9aaa5343d623f92951751df190df81" -dependencies = [ - "anyhow", - "base64", - "bytes", - "cfg-if", - "document-features", - "flate2", - "indexmap 1.9.3", - "libc", - "once_cell", - "semver", - "serde", - "serde_cbor", - "serde_json", - "sha2", - "shared-buffer", - "tar", - "tempfile", - "thiserror", - "toml", - "url", - "wasmer-config", -] - [[package]] name = "webpki-roots" version = "0.26.6" @@ -2592,31 +2421,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "windows-sys" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" -dependencies = [ - "windows_aarch64_msvc 0.33.0", - "windows_i686_gnu 0.33.0", - "windows_i686_msvc 0.33.0", - "windows_x86_64_gnu 0.33.0", - "windows_x86_64_msvc 0.33.0", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -2642,13 +2446,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.52.6", + "windows_x86_64_msvc", ] [[package]] @@ -2657,24 +2461,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -2687,24 +2479,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -2717,36 +2497,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "xattr" version = "1.3.1" @@ -2764,6 +2520,24 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" +[[package]] +name = "xz" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c887690ff2a2e233e8e49633461521f98ec57fbff9d59a884c9a4f04ec1da34" +dependencies = [ + "xz2", +] + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -2790,6 +2564,20 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", +] [[package]] name = "zip" @@ -2797,15 +2585,27 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ + "aes", "arbitrary", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", "displaydoc", "flate2", + "hmac", "indexmap 2.4.0", + "lzma-rs", "memchr", + "pbkdf2", + "rand", + "sha1", "thiserror", + "time", + "zeroize", "zopfli", + "zstd", ] [[package]] @@ -2821,3 +2621,31 @@ dependencies = [ "once_cell", "simd-adler32", ] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/crates/host/Cargo.toml b/crates/host/Cargo.toml index 994ac7d1..a75e0ca9 100644 --- a/crates/host/Cargo.toml +++ b/crates/host/Cargo.toml @@ -7,11 +7,8 @@ authors = ["thedavidmeister", "thedavidmeister@gmail.com"] edition = "2021" [dependencies] -wasmer = { version = "=4.3.6", optional = true, default-features = false } -wasmer-middlewares = { version = "=4.3.6", optional = true, default-features = false } - -# Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +wasmer = { version = "5.0.2", default-features = false } +wasmer-middlewares = { version = "5.0.2", optional = true } holochain_wasmer_common = { version = "=0.0.96", path = "../common" } holochain_serialized_bytes = "=0.0.55" @@ -34,7 +31,6 @@ default = ["error_as_host", "wasmer_sys_dev"] debug_memory = [] error_as_host = ["holochain_wasmer_common/error_as_host"] wasmer_sys = [ - "dep:wasmer", "dep:wasmer-middlewares", "wasmer/sys", ] @@ -47,6 +43,5 @@ wasmer_sys_prod = [ "wasmer/llvm", ] wasmer_wamr = [ - "dep:hc-wasmer", - "hc-wasmer/wamr" + "wasmer/wamr" ] diff --git a/crates/host/src/lib.rs b/crates/host/src/lib.rs index 857a5421..1f925487 100644 --- a/crates/host/src/lib.rs +++ b/crates/host/src/lib.rs @@ -14,7 +14,3 @@ compile_error!( #[cfg(all(not(feature = "wasmer_sys"), not(feature = "wasmer_wamr"),))] compile_error!("One of: `wasmer_sys`, `wasmer_wamr` features must be enabled. Please, pick one."); - -// Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -#[cfg(feature = "wasmer_wamr")] -extern crate hc_wasmer as wasmer; diff --git a/flake.lock b/flake.lock index b25b8a3c..d7a5a53a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "cargo-chef": { "flake": false, "locked": { - "lastModified": 1695999026, - "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", + "lastModified": 1716357509, + "narHash": "sha256-7iSxwTaJnDLqaFu4ydxkx7ivhDvSQQcXWKawv/e4NHE=", "owner": "LukeMathWalker", "repo": "cargo-chef", - "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", + "rev": "b468537839bfc7c23d744b85d7a5090954626550", "type": "github" }, "original": { @@ -20,33 +20,27 @@ "cargo-rdme": { "flake": false, "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "lastModified": 1718044745, + "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", "owner": "orium", "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "rev": "22d756971037ad4c7953db882c5b96a662364f15", "type": "github" }, "original": { "owner": "orium", - "ref": "v1.1.0", + "ref": "v1.4.4", "repo": "cargo-rdme", "type": "github" } }, "crane": { - "inputs": { - "nixpkgs": [ - "holochain-flake", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1707363936, - "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", "owner": "ipetkov", "repo": "crane", - "rev": "9107434eda6991e9388ad87b815dafa337446d16", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", "type": "github" }, "original": { @@ -55,22 +49,6 @@ "type": "github" } }, - "crate2nix": { - "flake": false, - "locked": { - "lastModified": 1706909251, - "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", - "type": "github" - }, - "original": { - "owner": "kolloch", - "repo": "crate2nix", - "type": "github" - } - }, "empty": { "flake": false, "locked": { @@ -108,11 +86,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -120,37 +98,19 @@ "type": "indirect" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "holochain": { "flake": false, "locked": { - "lastModified": 1715735100, - "narHash": "sha256-l0X+rEQqKUnCgXajbN1Sob9uyPXvU6/zieiwu/fcgdQ=", + "lastModified": 1730855012, + "narHash": "sha256-oW4d2DRHxktRkkGbilWL8ZufXfA3vGeMXLnLgi12Ewk=", "owner": "holochain", "repo": "holochain", - "rev": "75da69b6cd08b23abefbfaec7c80de6ff762cbf8", + "rev": "525b63fb019eac866e096033ba194c2d8bb45b9a", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0-dev.3", + "ref": "holochain-0.5.0-dev.4", "repo": "holochain", "type": "github" } @@ -160,7 +120,6 @@ "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", "crane": "crane", - "crate2nix": "crate2nix", "empty": "empty", "flake-compat": "flake-compat", "flake-parts": "flake-parts", @@ -190,11 +149,11 @@ ] }, "locked": { - "lastModified": 1715943311, - "narHash": "sha256-cxR++zyoft60YZNDIJySPGpjlgUjtmX8yDAo+VsmOhc=", + "lastModified": 1731093440, + "narHash": "sha256-+k2JYY9hCBcKHWxj3iq7duAtzXL2KTC73YA8O9fhObU=", "owner": "holochain", "repo": "holochain", - "rev": "a611d4a2f93a44163e57ea24fa6dbac2c0b430b2", + "rev": "37cd2b92addb41382c4c6b3680e39d264d039b63", "type": "github" }, "original": { @@ -206,16 +165,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1709335027, - "narHash": "sha256-rKMhh7TLuR1lqze2YFWZCGYKZQoB4dZxjpX3sb7r7Jk=", + "lastModified": 1726865440, + "narHash": "sha256-+ARQs+Sfmh8QXMyjjHjm6Ib8Ag86Jm2vnyB6l3zTCgA=", "owner": "holochain", "repo": "lair", - "rev": "826be915efc839d1d1b8a2156b158999b8de8d5b", + "rev": "9f306efed597765b70da704e1739ecc67f2510e0", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.4", + "ref": "lair_keystore-v0.5.2", "repo": "lair", "type": "github" } @@ -223,27 +182,27 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1715106263, - "narHash": "sha256-a7iQ8pKGz6fghJrtXq0Xamp57GE8Hd3w5YQASzz5Wlk=", + "lastModified": 1727250978, + "narHash": "sha256-6u/VjFRV4eQQS4H0he7C0n7uNjzBBtkeoyN46jTO0mc=", "owner": "holochain", - "repo": "launcher", - "rev": "92bd39e1c66912d61c35c4725d7b106959888670", + "repo": "hc-launch", + "rev": "92afce654187be5abef67d34df20bd6464524cf3", "type": "github" }, "original": { "owner": "holochain", "ref": "holochain-weekly", - "repo": "launcher", + "repo": "hc-launch", "type": "github" } }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -254,11 +213,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -269,30 +228,24 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", - "type": "github" + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "pre-commit-hooks-nix": { "flake": false, "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -325,18 +278,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "holochain-flake", "nixpkgs" ] }, "locked": { - "lastModified": 1715912155, - "narHash": "sha256-UXHk4dKvvm5mSuDDON3lXU5CHKiTRnIjA5mUtDOtKEU=", + "lastModified": 1728181869, + "narHash": "sha256-sQXHXsjIcGEoIHkB+RO6BZdrPfB+43V1TEpyoWRI3ww=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d3a96b08a7280a5753246129b462eed3662815d5", + "rev": "cd46aa3906c14790ef5cbe278d9e54f2c38f95c0", "type": "github" }, "original": { @@ -348,11 +300,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1715855685, - "narHash": "sha256-EI754ZRRW2r0QyZx7ECND14CcdFFLRsw+NgfiXpjeuw=", + "lastModified": 1730407032, + "narHash": "sha256-NNnow8Cne1KBJ4WvJ6eT1OzcqyJiii35Q2ElVdI0ozA=", "owner": "holochain", "repo": "scaffolding", - "rev": "941dc28c15ab11dca93602ee5aced9fa753f3327", + "rev": "f838294a3c4f45b3e8e41297ea36eb91cfedee80", "type": "github" }, "original": { @@ -362,21 +314,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "versions": { "inputs": { "holochain": "holochain", @@ -386,11 +323,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1715943311, - "narHash": "sha256-cxR++zyoft60YZNDIJySPGpjlgUjtmX8yDAo+VsmOhc=", + "lastModified": 1731093440, + "narHash": "sha256-+k2JYY9hCBcKHWxj3iq7duAtzXL2KTC73YA8O9fhObU=", "owner": "holochain", "repo": "holochain", - "rev": "a611d4a2f93a44163e57ea24fa6dbac2c0b430b2", + "rev": "37cd2b92addb41382c4c6b3680e39d264d039b63", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 98974d5c..fe3d3923 100644 --- a/flake.nix +++ b/flake.nix @@ -22,12 +22,13 @@ ]; packages = with pkgs; [ - # These packages and env vars are required to build Wasmer with the 'wamr' feature (i.e. the hc-wasmer dependency) + # These packages and env vars are required to build Wasmer with the 'wamr' feature cmake clang llvmPackages.libclang.lib + ninja # These packages are required to build Wasmer with the production config - llvm_15 + llvm_18 libffi libxml2 zlib @@ -38,7 +39,7 @@ # Used by wasmer production config shellHook = '' # This binary lives in a different derivation to `llvm_15` and isn't re-exported through that derivation - export LLVM_SYS_150_PREFIX=$(which llvm-config | xargs dirname | xargs dirname) + export LLVM_SYS_180_PREFIX=$(which llvm-config | xargs dirname | xargs dirname) export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.libffi}/lib:${pkgs.zlib}/lib:${pkgs.ncurses}/lib" ''; }; diff --git a/test/Cargo.lock b/test/Cargo.lock index 61361628..d8b35b25 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -17,15 +17,27 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" -version = "0.7.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -64,12 +76,6 @@ dependencies = [ "derive_arbitrary", ] -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - [[package]] name = "atty" version = "0.2.14" @@ -102,12 +108,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -131,16 +131,14 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.10.5", - "lazy_static", - "lazycell", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -148,8 +146,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.66", - "which", + "syn 2.0.87", ] [[package]] @@ -164,18 +161,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -197,8 +182,20 @@ version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ - "bytecheck_derive", - "ptr_meta", + "bytecheck_derive 0.6.12", + "ptr_meta 0.1.4", + "simdutf8", +] + +[[package]] +name = "bytecheck" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f" +dependencies = [ + "bytecheck_derive 0.8.0", + "ptr_meta 0.3.0", + "rancor", "simdutf8", ] @@ -213,6 +210,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bytecheck_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -224,17 +232,26 @@ name = "bytes" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ - "serde", + "bzip2-sys", + "libc", ] [[package]] -name = "bytesize" -version = "1.3.0" +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" dependencies = [ - "serde", + "cc", + "libc", + "pkg-config", ] [[package]] @@ -280,6 +297,11 @@ name = "cc" version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] [[package]] name = "cexpr" @@ -320,7 +342,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", - "half 2.4.1", + "half", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", ] [[package]] @@ -368,17 +400,23 @@ dependencies = [ "cc", ] +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "corosensei" -version = "0.1.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" +checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437" dependencies = [ "autocfg", "cfg-if", "libc", "scopeguard", - "windows-sys 0.33.0", + "windows-sys 0.59.0", ] [[package]] @@ -392,74 +430,80 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115" +checksum = "305d51c180ebdc46ef61bc60c54ae6512db3bc9a05842a1f1e762e45977019ab" dependencies = [ "cranelift-entity", ] +[[package]] +name = "cranelift-bitset" +version = "0.110.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "690d8ae6c73748e5ce3d8fe59034dceadb8823e6c8994ba324141c5eae909b0e" + [[package]] name = "cranelift-codegen" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" +checksum = "bd7ca95e831c18d1356da783765c344207cbdffea91e13e47fa9327dbb2e0719" dependencies = [ - "arrayvec", "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-egraph", + "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", + "gimli 0.28.1", + "hashbrown 0.14.5", "log", "regalloc2", + "rustc-hash", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.91.1" +version = "0.110.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74" +checksum = "f0a2d2ab65e6cbf91f81781d8da65ec2005510f18300eff21a99526ed6785863" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.91.1" +version = "0.110.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7" +checksum = "efcff860573cf3db9ae98fbd949240d78b319df686cc306872e7fab60e9c84d7" [[package]] -name = "cranelift-egraph" -version = "0.91.1" +name = "cranelift-control" +version = "0.110.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73" +checksum = "69d70e5b75c2d5541ef80a99966ccd97aaa54d2a6af19ea31759a28538e1685a" dependencies = [ - "cranelift-entity", - "fxhash", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "log", - "smallvec", + "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c" +checksum = "a48cb0a194c9ba82fec35a1e492055388d89b2e3c03dee9dcf2488892be8004d" +dependencies = [ + "cranelift-bitset", +] [[package]] name = "cranelift-frontend" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" +checksum = "8327afc6c1c05f4be62fefce5b439fa83521c65363a322e86ea32c85e7ceaf64" dependencies = [ "cranelift-codegen", "log", @@ -469,9 +513,24 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.91.1" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +checksum = "56b08621c00321efcfa3eee6a3179adc009e21ea8d24ca7adc3c326184bc3f48" + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" @@ -578,38 +637,14 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - [[package]] name = "darling" version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -622,19 +657,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", - "syn 2.0.66", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", + "strsim", + "syn 2.0.87", ] [[package]] @@ -643,9 +667,9 @@ version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.9", + "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.87", ] [[package]] @@ -663,14 +687,18 @@ dependencies = [ ] [[package]] -name = "derivative" -version = "2.2.0" +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + +[[package]] +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "powerfmt", ] [[package]] @@ -681,38 +709,18 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", ] [[package]] -name = "derive_builder" -version = "0.12.0" +name = "derive_more" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", + "syn 2.0.87", ] [[package]] @@ -723,6 +731,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -733,24 +742,9 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", ] -[[package]] -name = "document-features" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" -dependencies = [ - "litrs", -] - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - [[package]] name = "either" version = "1.12.0" @@ -792,10 +786,10 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.9", + "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", ] [[package]] @@ -829,9 +823,9 @@ dependencies = [ [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" @@ -876,21 +870,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -916,12 +895,12 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 1.9.3", + "indexmap 2.2.6", "stable_deref_trait", ] @@ -937,12 +916,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "half" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" - [[package]] name = "half" version = "2.4.1" @@ -958,135 +931,23 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] [[package]] name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "hc-wasmer" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" -dependencies = [ - "bindgen", - "bytes", - "cfg-if", - "cmake", - "derivative", - "hc-wasmer-compiler", - "hc-wasmer-derive", - "hc-wasmer-types", - "hc-wasmer-vm", - "indexmap 1.9.3", - "js-sys", - "more-asserts", - "rustc-demangle", - "serde", - "serde-wasm-bindgen", - "shared-buffer", - "target-lexicon", - "thiserror", - "tracing", - "ureq", - "wasm-bindgen", - "wasmparser", - "wat", - "windows-sys 0.59.0", - "zip", -] - -[[package]] -name = "hc-wasmer-compiler" -version = "4.3.6-hc.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "backtrace", - "bytes", - "cfg-if", - "enum-iterator", - "enumset", - "hc-wasmer-types", - "hc-wasmer-vm", - "lazy_static", - "leb128", - "libc", - "memmap2 0.5.10", - "more-asserts", - "region", - "rkyv", - "self_cell", - "shared-buffer", - "smallvec", - "thiserror", - "windows-sys 0.59.0", - "xxhash-rust", -] - -[[package]] -name = "hc-wasmer-derive" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "hc-wasmer-types" -version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" -dependencies = [ - "bytecheck", - "enum-iterator", - "enumset", - "getrandom", - "hex", - "indexmap 1.9.3", - "more-asserts", - "rkyv", - "sha2", - "target-lexicon", - "thiserror", - "xxhash-rust", + "ahash", ] [[package]] -name = "hc-wasmer-vm" -version = "4.3.6-hc.1" +name = "hashbrown" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "backtrace", - "cc", - "cfg-if", - "corosensei", - "crossbeam-queue", - "dashmap", - "derivative", - "enum-iterator", - "fnv", - "hc-wasmer-types", - "indexmap 1.9.3", - "lazy_static", - "libc", - "mach2", - "memoffset", - "more-asserts", - "region", - "scopeguard", - "thiserror", - "windows-sys 0.59.0", + "ahash", ] [[package]] @@ -1116,6 +977,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "holochain_serialized_bytes" version = "0.0.55" @@ -1158,7 +1028,6 @@ version = "0.0.96" dependencies = [ "bimap", "bytes", - "hc-wasmer", "hex", "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1171,15 +1040,6 @@ dependencies = [ "wasmer-middlewares", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "humantime" version = "2.1.0" @@ -1210,7 +1070,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -1221,32 +1080,40 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", - "serde", ] [[package]] name = "inkwell" -version = "0.1.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbac11e485159a525867fb7e6aa61981453e6a72f625fde6a4ab3047b0c6dec9" +checksum = "40fb405537710d51f6bdbc8471365ddd4cd6d3a3c3ad6e0c8291691031ba94b2" dependencies = [ "either", "inkwell_internals", "libc", "llvm-sys", "once_cell", - "parking_lot", + "thiserror", ] [[package]] name = "inkwell_internals" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d00c17e264ce02be5bc23d7bff959188ec7137beddd06b8b6b05a7c680ea85" +checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", ] [[package]] @@ -1269,6 +1136,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.13.0" @@ -1284,6 +1160,15 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.69" @@ -1299,12 +1184,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leb128" version = "0.2.5" @@ -1313,9 +1192,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libloading" @@ -1333,22 +1212,17 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - [[package]] name = "llvm-sys" -version = "150.2.1" +version = "180.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa55828745895d37233756307ded95a235b058aeb89cd12717ec7c3912089ee9" +checksum = "778fa5fa02e32728e718f11eec147e6f134137399ab02fd2c13d32476337affa" dependencies = [ + "anyhow", "cc", "lazy_static", "libc", - "regex", + "regex-lite", "semver", ] @@ -1374,6 +1248,27 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "mach2" version = "0.4.2" @@ -1389,15 +1284,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.6.2" @@ -1437,6 +1323,26 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" +[[package]] +name = "munge" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "nom" version = "7.1.3" @@ -1447,6 +1353,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-traits" version = "0.2.19" @@ -1458,13 +1370,27 @@ dependencies = [ [[package]] name = "object" -version = "0.28.4" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "crc32fast", + "flate2", + "hashbrown 0.14.5", + "indexmap 2.2.6", + "memchr", + "ruzstd", +] + [[package]] name = "object" version = "0.35.0" @@ -1515,6 +1441,16 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -1527,6 +1463,12 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + [[package]] name = "plotters" version = "0.3.6" @@ -1555,6 +1497,12 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1568,31 +1516,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.87", ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.87", ] [[package]] @@ -1610,7 +1556,16 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "ptr_meta_derive", + "ptr_meta_derive 0.1.4", +] + +[[package]] +name = "ptr_meta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90" +dependencies = [ + "ptr_meta_derive 0.3.0", ] [[package]] @@ -1624,6 +1579,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ptr_meta_derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "quote" version = "1.0.36" @@ -1634,10 +1600,13 @@ dependencies = [ ] [[package]] -name = "radium" -version = "0.7.0" +name = "rancor" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947" +dependencies = [ + "ptr_meta 0.3.0", +] [[package]] name = "rand" @@ -1709,12 +1678,13 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.5.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ - "fxhash", + "hashbrown 0.13.2", "log", + "rustc-hash", "slice-group-by", "smallvec", ] @@ -1742,6 +1712,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" version = "0.8.3" @@ -1762,11 +1738,11 @@ dependencies = [ [[package]] name = "rend" -version = "0.4.2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" dependencies = [ - "bytecheck", + "bytecheck 0.8.0", ] [[package]] @@ -1786,32 +1762,32 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "395027076c569819ea6035ee62e664f5e03d74e281744f55261dd1afd939212b" dependencies = [ - "bitvec", - "bytecheck", + "bytecheck 0.8.0", "bytes", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "ptr_meta", + "hashbrown 0.14.5", + "indexmap 2.2.6", + "munge", + "ptr_meta 0.3.0", + "rancor", "rend", "rkyv_derive", - "seahash", "tinyvec", "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", ] [[package]] @@ -1902,6 +1878,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "ruzstd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" +dependencies = [ + "byteorder", + "derive_more", + "twox-hash", +] + [[package]] name = "ryu" version = "1.0.18" @@ -1917,43 +1904,12 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schemars" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "schemars_derive" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.66", -] - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "self_cell" version = "1.0.4" @@ -2007,16 +1963,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half 1.8.3", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.203" @@ -2025,18 +1971,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_derive_internals" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", + "syn 2.0.87", ] [[package]] @@ -2051,28 +1986,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.2.6", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha1" version = "0.10.6" @@ -2102,7 +2015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" dependencies = [ "bytes", - "memmap2 0.6.2", + "memmap2", ] [[package]] @@ -2148,10 +2061,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "strsim" -version = "0.10.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" @@ -2178,26 +2091,20 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tar" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -2238,7 +2145,6 @@ dependencies = [ "criterion", "ctor", "env_logger", - "hc-wasmer", "holochain_serialized_bytes", "holochain_wasmer_common", "holochain_wasmer_host", @@ -2283,14 +2189,14 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e6b4c7391a38f0f026972ec2200bcfd1ec45533aa266fdae5858d011afc500" dependencies = [ - "darling 0.20.9", + "darling", "heck", "itertools 0.13.0", "once_cell", "prettyplease", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", ] [[package]] @@ -2332,9 +2238,28 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", ] +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + [[package]] name = "tinytemplate" version = "1.2.1" @@ -2360,65 +2285,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.14", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.12", -] - [[package]] name = "tracing" version = "0.1.40" @@ -2438,7 +2304,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", ] [[package]] @@ -2450,6 +2316,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + [[package]] name = "typenum" version = "1.17.0" @@ -2483,12 +2359,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.9.0" @@ -2501,7 +2371,7 @@ version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ - "base64 0.22.1", + "base64", "flate2", "log", "once_cell", @@ -2520,7 +2390,6 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] @@ -2572,7 +2441,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -2594,7 +2463,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2607,22 +2476,23 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" -version = "0.32.0" +version = "0.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" +checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88" dependencies = [ "leb128", ] [[package]] name = "wasmer" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be5fa49d7d97f83e095f090dcc178d923f2970f588443283cd7a94974ab8cbe" +checksum = "9817a0dd105a992d9f3e8831370acddbdf3848e5357086a569dc4fb07c2aa57d" dependencies = [ + "bindgen", "bytes", "cfg-if", - "derivative", + "cmake", "indexmap 1.9.3", "js-sys", "more-asserts", @@ -2630,9 +2500,11 @@ dependencies = [ "serde", "serde-wasm-bindgen", "shared-buffer", + "tar", "target-lexicon", "thiserror", "tracing", + "ureq", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2640,15 +2512,18 @@ dependencies = [ "wasmer-derive", "wasmer-types", "wasmer-vm", + "wasmparser", "wat", "windows-sys 0.59.0", + "xz", + "zip", ] [[package]] name = "wasmer-compiler" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9696a040f935903db440078cd287c0288ab152394122de442fdd21b3eaa8cd2c" +checksum = "0261d34a6f61d666e4f954254cf486371117db3e8a875767c5e3f21e45eb43aa" dependencies = [ "backtrace", "bytes", @@ -2658,13 +2533,15 @@ dependencies = [ "lazy_static", "leb128", "libc", - "memmap2 0.5.10", + "memmap2", "more-asserts", + "object 0.32.2", "region", "rkyv", "self_cell", "shared-buffer", "smallvec", + "target-lexicon", "thiserror", "wasmer-types", "wasmer-vm", @@ -2675,14 +2552,15 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5959da148d41a5870d1b18a880e19353add47c0ca95e510061275ea467b6b44" +checksum = "fdc984c651c29e30ec4f6da82ca472b9d2dd50dfe4c9edd84628e59f876ea2d0" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "gimli 0.26.2", + "gimli 0.28.1", + "itertools 0.12.1", "more-asserts", "rayon", "smallvec", @@ -2694,9 +2572,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-llvm" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86da768569a3b509285e486a93a3058b4837668c9c7fb54d7d208469fb06f028" +checksum = "87659b36db0aa023c1dc292ec5b99c0df3e956ec1361acfe4a409faffa410c94" dependencies = [ "byteorder", "cc", @@ -2704,7 +2582,7 @@ dependencies = [ "itertools 0.10.5", "lazy_static", "libc", - "object 0.28.4", + "object 0.30.4", "rayon", "regex", "rustc_version", @@ -2716,35 +2594,13 @@ dependencies = [ "wasmer-vm", ] -[[package]] -name = "wasmer-config" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8" -dependencies = [ - "anyhow", - "bytesize", - "derive_builder", - "hex", - "indexmap 2.2.6", - "schemars", - "semver", - "serde", - "serde_cbor", - "serde_json", - "serde_yaml", - "thiserror", - "toml 0.8.14", - "url", -] - [[package]] name = "wasmer-derive" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f448efbe12d656ba96d997c9e338f15cd80934c81f2286c2730cb9224d4e41d" +checksum = "7a2e5a149301403084c3198b68cd635b7f210e8d26f533218a7a68b6d20b441e" dependencies = [ - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 1.0.109", @@ -2752,9 +2608,9 @@ dependencies = [ [[package]] name = "wasmer-middlewares" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a3c1a7474e5abd75fe6bde4d34fee77c22261b45f157bb769d4a297749463c" +checksum = "b8c441261b0388b1dcb062474912e998f81ce2cd033e0fd9b97fa79917637b9f" dependencies = [ "wasmer", "wasmer-types", @@ -2763,30 +2619,29 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b383ef63005176be3bc2056d3b4078ae1497b324f573d79acbf81036f1c9ec" +checksum = "d09f305bc775871b551c5907facaadc8e7ddc0845b0ccd18ccb2c046d0f9b7f0" dependencies = [ - "bytecheck", + "bytecheck 0.6.12", "enum-iterator", "enumset", "getrandom", "hex", - "indexmap 1.9.3", + "indexmap 2.2.6", "more-asserts", "rkyv", "sha2", "target-lexicon", "thiserror", - "webc", "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.3.6" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c371597ec33248e775de641c7a475173fb60f2b5ea085c74d34cee9fad06b83" +checksum = "0ab1b03c3cb791e94f63a44377fe35936496d35230d8219a36af11b090940c99" dependencies = [ "backtrace", "cc", @@ -2794,10 +2649,9 @@ dependencies = [ "corosensei", "crossbeam-queue", "dashmap", - "derivative", "enum-iterator", "fnv", - "indexmap 1.9.3", + "indexmap 2.2.6", "lazy_static", "libc", "mach2", @@ -2812,21 +2666,24 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3" dependencies = [ + "ahash", "bitflags 2.5.0", + "hashbrown 0.14.5", "indexmap 2.2.6", "semver", ] [[package]] name = "wast" -version = "64.0.0" +version = "216.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" +checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08" dependencies = [ + "bumpalo", "leb128", "memchr", "unicode-width", @@ -2835,9 +2692,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.71" +version = "1.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" +checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a" dependencies = [ "wast", ] @@ -2852,35 +2709,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webc" -version = "6.0.0-rc1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad" -dependencies = [ - "anyhow", - "base64 0.21.7", - "bytes", - "cfg-if", - "document-features", - "flate2", - "indexmap 1.9.3", - "libc", - "once_cell", - "semver", - "serde", - "serde_cbor", - "serde_json", - "sha2", - "shared-buffer", - "tar", - "tempfile", - "thiserror", - "toml 0.7.8", - "url", - "wasmer-config", -] - [[package]] name = "webpki-roots" version = "0.26.3" @@ -2890,18 +2718,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2933,19 +2749,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" -dependencies = [ - "windows_aarch64_msvc 0.33.0", - "windows_i686_gnu 0.33.0", - "windows_i686_msvc 0.33.0", - "windows_x86_64_gnu 0.33.0", - "windows_x86_64_msvc 0.33.0", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -2971,13 +2774,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.52.6", + "windows_x86_64_msvc", ] [[package]] @@ -2986,24 +2789,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -3016,24 +2807,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -3046,12 +2825,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -3059,54 +2832,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winnow" -version = "0.5.40" +name = "xattr" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "memchr", + "libc", + "linux-raw-sys", + "rustix", ] [[package]] -name = "winnow" -version = "0.6.12" +name = "xxhash-rust" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ff33f391015ecab21cd092389215eb265ef9496a9a07b6bee7d3529831deda" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[package]] +name = "xz" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c887690ff2a2e233e8e49633461521f98ec57fbff9d59a884c9a4f04ec1da34" dependencies = [ - "memchr", + "xz2", ] [[package]] -name = "wyz" -version = "0.5.1" +name = "xz2" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" dependencies = [ - "tap", + "lzma-sys", ] [[package]] -name = "xattr" -version = "1.3.1" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "libc", - "linux-raw-sys", - "rustix", + "zerocopy-derive", ] [[package]] -name = "xxhash-rust" -version = "0.8.10" +name = "zerocopy-derive" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] [[package]] name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] [[package]] name = "zip" @@ -3114,15 +2912,27 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ + "aes", "arbitrary", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", "displaydoc", "flate2", + "hmac", "indexmap 2.2.6", + "lzma-rs", "memchr", + "pbkdf2", + "rand", + "sha1", "thiserror", + "time", + "zeroize", "zopfli", + "zstd", ] [[package]] @@ -3138,3 +2948,31 @@ dependencies = [ "once_cell", "simd-adler32", ] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/test/Cargo.toml b/test/Cargo.toml index dd9d380d..6bdd7b1b 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -18,11 +18,8 @@ test-fuzz = "=6.0.0" once_cell = "1" tempfile = "3" -wasmer = { version = "=4.3.6", optional = true, default-features = false } -wasmer-middlewares = { version = "=4.3.6", optional = true, default-features = false } - -# Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +wasmer = { version = "5.0.2", default-features = false } +wasmer-middlewares = { version = "5.0.2", optional = true } [dev-dependencies] env_logger = "0.8" @@ -44,13 +41,12 @@ debug = true debug_memory = ["holochain_wasmer_host/debug_memory"] default = ["wasmer_sys_dev"] wasmer_sys = [ - "dep:wasmer", "dep:wasmer-middlewares", "wasmer/sys", ] wasmer_sys_dev = [ "wasmer_sys", - "wasmer/default", + "wasmer/default", "holochain_wasmer_host/wasmer_sys_dev" ] wasmer_sys_prod = [ @@ -58,7 +54,6 @@ wasmer_sys_prod = [ "holochain_wasmer_host/wasmer_sys_prod" ] wasmer_wamr = [ - "dep:hc-wasmer", - "hc-wasmer/wamr", + "wasmer/wamr", "holochain_wasmer_host/wasmer_wamr" ] \ No newline at end of file diff --git a/test/benches/bench.rs b/test/benches/bench.rs index bd096706..72338627 100644 --- a/test/benches/bench.rs +++ b/test/benches/bench.rs @@ -1,7 +1,3 @@ -// Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -#[cfg(feature = "wasmer_wamr")] -extern crate hc_wasmer as wasmer; - use criterion::BenchmarkId; use criterion::Throughput; use criterion::{criterion_group, criterion_main, Criterion}; diff --git a/test/src/test.rs b/test/src/test.rs index f5b02324..0e4c12a7 100644 --- a/test/src/test.rs +++ b/test/src/test.rs @@ -1,10 +1,6 @@ pub mod import; pub mod wasms; -// Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -#[cfg(feature = "wasmer_wamr")] -extern crate hc_wasmer as wasmer; - use holochain_wasmer_host::prelude::*; use holochain_wasmer_host::wasm_host_error as wasm_error; use test_common::SomeStruct;