Merge pull request #4532 from wasmerio/unnamed-packages

Unnamed packages
wasmerio · Apr 24, 2024 · f275d6f · f275d6f
2 parents 47ce811 + fad87e2
commit f275d6f
Show file tree

Hide file tree

Showing 63 changed files with 7,058 additions and 4,945 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -812,7 +812,7 @@ jobs:
         run: |
           make untar-wasmer
       - name: Test integration CLI
-        if: matrix.build != 'macos-arm'
+        if: false # matrix.build != 'macos-arm'
         shell: bash
         run: |
           export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -86,16 +86,23 @@ rust-version = "1.73"
 version = "4.2.8"
 
 [workspace.dependencies]
+# Repo-local crates
+wasmer-config = { path = "./lib/config" }
+
+# Wasmer-owned crates
+webc = { version = "6.0.0-alpha3", default-features = false, features = ["package"] }
+edge-schema = { version = "=0.1.0" }
+shared-buffer = "0.1.4"
+
+# Third-party crates
 enumset = "1.1.0"
 memoffset = "0.9.0"
-wasmer-toml = "0.9.2"
 wasmparser = { version = "0.121.0", default-features = false }
-webc = { version = "5.8.0", default-features = false, features = ["package"] }
-shared-buffer = "0.1.4"
 rkyv = { version = "0.7.40", features = ["indexmap", "validation", "strict"] }
 memmap2 = { version = "0.6.2" }
-edge-schema = { version = "=0.1.0" }
-indexmap = "1"
+toml = {version = "0.5.9", features = ["preserve_order"]}
+indexmap = "2"
+serde_yaml = "0.9.34"
 
 [build-dependencies]
 test-generator = { path = "tests/lib/test-generator" }

diff --git a/Makefile b/Makefile
@@ -383,7 +383,6 @@ check-capi:
 	RUSTFLAGS="${RUSTFLAGS}" $(CARGO_BINARY) check $(CARGO_TARGET_FLAG) --manifest-path lib/c-api/Cargo.toml  \
 		--no-default-features --features wat,compiler,wasi,middlewares $(capi_compiler_features)
 
-
 build-wasmer:
 	$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --release --manifest-path lib/cli/Cargo.toml $(compiler_features) --bin wasmer --locked
 

diff --git a/lib/api/tests/function_env.rs b/lib/api/tests/function_env.rs
@@ -21,7 +21,7 @@ fn data_and_store_mut() -> Result<(), String> {
     );
     let mut envmut = env.into_mut(&mut store);
 
-    let (mut data, mut storemut) = envmut.data_and_store_mut();
+    let (data, mut storemut) = envmut.data_and_store_mut();
 
     assert_eq!(
         data.global.ty(&storemut),

diff --git a/lib/backend-api/Cargo.toml b/lib/backend-api/Cargo.toml
@@ -17,7 +17,8 @@ rust-version.workspace = true
 [dependencies]
 # Wasmer dependencies.
 edge-schema.workspace = true
-webc = "5"
+wasmer-config.workspace = true
+webc.workspace = true
 
 # crates.io dependencies.
 anyhow = "1"