From dcc9cc1f1b27126e212a910d181f8a84cfac6e61 Mon Sep 17 00:00:00 2001 From: Christoph Herzog Date: Thu, 2 Nov 2023 13:19:29 +0100 Subject: [PATCH] deps: Lift memoffset into a workspace dependency To avoid duplication --- Cargo.lock | 13 ++----------- Cargo.toml | 1 + lib/types/Cargo.toml | 2 +- lib/vm/Cargo.toml | 2 +- lib/wasi-web/Cargo.lock | 4 ++-- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c567a71b40..fdcf4a1caaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2528,15 +2528,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -6164,7 +6155,7 @@ dependencies = [ "enum-iterator", "enumset", "indexmap 1.9.3", - "memoffset 0.6.5", + "memoffset 0.9.0", "more-asserts", "rkyv", "serde", @@ -6190,7 +6181,7 @@ dependencies = [ "lazy_static", "libc", "mach", - "memoffset 0.8.0", + "memoffset 0.9.0", "more-asserts", "region", "scopeguard", diff --git a/Cargo.toml b/Cargo.toml index ce8c16815c3..80412da5860 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,6 +86,7 @@ version = "4.2.3" [workspace.dependencies] webc = { version = "5.5.1", default-features = false, features = ["package"] } wasmer-toml = "0.8.0" +memoffset = "0.9.0" [build-dependencies] test-generator = { path = "tests/lib/test-generator" } diff --git a/lib/types/Cargo.toml b/lib/types/Cargo.toml index cd533953420..951501e242d 100644 --- a/lib/types/Cargo.toml +++ b/lib/types/Cargo.toml @@ -25,7 +25,7 @@ enumset = "1.0" bytecheck = "0.6.8" [dev-dependencies] -memoffset = "0.9.0" +memoffset.workspace = true [features] default = ["std"] diff --git a/lib/vm/Cargo.toml b/lib/vm/Cargo.toml index 8cab70fa04d..9441d6e27de 100644 --- a/lib/vm/Cargo.toml +++ b/lib/vm/Cargo.toml @@ -13,9 +13,9 @@ rust-version.workspace = true version.workspace = true [dependencies] +memoffset.workspace = true wasmer-types = { path = "../types", version = "=4.2.3" } libc = { version = "^0.2", default-features = false } -memoffset = "0.9.0" indexmap = { version = "1.6" } thiserror = "1.0" more-asserts = "0.2" diff --git a/lib/wasi-web/Cargo.lock b/lib/wasi-web/Cargo.lock index e41142c8b31..44e613acd7a 100644 --- a/lib/wasi-web/Cargo.lock +++ b/lib/wasi-web/Cargo.lock @@ -1027,9 +1027,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ]