From f468003e1c9897cdc0c4f7a5e2b897edfd6c73e8 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Sun, 19 Nov 2023 02:24:05 +0100 Subject: [PATCH 1/2] Bump min enumset version to 1.1.0 The symbol `enumset::__internal::EnumSetTypeRepr` used in types was only made public in 1.1.0: https://github.com/Lymia/enumset/compare/v1.0.13...v1.1.0 --- lib/c-api/Cargo.toml | 2 +- lib/compiler-singlepass/Cargo.toml | 2 +- lib/compiler/Cargo.toml | 2 +- lib/types/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml index 97233d246a8..05eb270673a 100644 --- a/lib/c-api/Cargo.toml +++ b/lib/c-api/Cargo.toml @@ -35,7 +35,7 @@ wasmer-types = { version = "=4.2.3", path = "../types" } wasmer-wasix = { version = "0.16.0", path = "../wasix", features = ["host-fs", "host-vnet"], optional = true } webc = { version = "5.0", optional = true } virtual-fs = { version = "0.9.0", path = "../virtual-fs", optional = true, default-features = false, features = ["static-fs"] } -enumset = "1.0.2" +enumset = "1.1.0" cfg-if = "1.0" lazy_static = "1.4" libc = { version = "^0.2", default-features = false } diff --git a/lib/compiler-singlepass/Cargo.toml b/lib/compiler-singlepass/Cargo.toml index ac0d709e0b9..226496a8d80 100644 --- a/lib/compiler-singlepass/Cargo.toml +++ b/lib/compiler-singlepass/Cargo.toml @@ -18,7 +18,7 @@ wasmer-compiler = { path = "../compiler", version = "=4.2.3", features = ["trans wasmer-types = { path = "../types", version = "=4.2.3", default-features = false, features = ["std"] } hashbrown = { version = "0.11", optional = true } gimli = { version = "0.26", optional = true } -enumset = "1.0.2" +enumset = "1.1.0" more-asserts = "0.2" dynasm = "1.2.3" dynasmrt = "1.2.3" diff --git a/lib/compiler/Cargo.toml b/lib/compiler/Cargo.toml index 54c14720703..a171533d500 100644 --- a/lib/compiler/Cargo.toml +++ b/lib/compiler/Cargo.toml @@ -16,7 +16,7 @@ version.workspace = true wasmer-types = { path = "../types", version = "=4.2.3", default-features = false } wasmer-object = { path = "../object", version = "=4.2.3", optional = true } wasmparser = { version = "0.95", optional = true, default-features = false } -enumset = "1.0.2" +enumset = "1.1.0" hashbrown = { version = "0.11", optional = true } serde = { version = "1.0", features = ["derive"], optional = true } thiserror = "1.0" diff --git a/lib/types/Cargo.toml b/lib/types/Cargo.toml index 951501e242d..99a7bd8150d 100644 --- a/lib/types/Cargo.toml +++ b/lib/types/Cargo.toml @@ -21,7 +21,7 @@ indexmap = { version = "1.6" } rkyv = { version = "0.7.40", features = ["indexmap", "validation", "strict"] } enum-iterator = "0.7.0" target-lexicon = { version = "0.12.2", default-features = false } -enumset = "1.0" +enumset = "1.1.0" bytecheck = "0.6.8" [dev-dependencies] From 51cd5c0979da5d1c59e80678f94efb3b0521e2a9 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 20 Nov 2023 09:02:42 +0100 Subject: [PATCH 2/2] Move enumset min version to workspace --- Cargo.toml | 1 + lib/c-api/Cargo.toml | 2 +- lib/compiler-singlepass/Cargo.toml | 2 +- lib/compiler/Cargo.toml | 2 +- lib/types/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fc9e5d7b73b..8e573bd6bad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,6 +84,7 @@ rust-version = "1.70" version = "4.2.3" [workspace.dependencies] +enumset = "1.1.0" memoffset = "0.9.0" wasmer-toml = "0.9.2" webc = { version = "5.8.0", default-features = false, features = ["package"] } diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml index 05eb270673a..d835a2438cf 100644 --- a/lib/c-api/Cargo.toml +++ b/lib/c-api/Cargo.toml @@ -35,7 +35,7 @@ wasmer-types = { version = "=4.2.3", path = "../types" } wasmer-wasix = { version = "0.16.0", path = "../wasix", features = ["host-fs", "host-vnet"], optional = true } webc = { version = "5.0", optional = true } virtual-fs = { version = "0.9.0", path = "../virtual-fs", optional = true, default-features = false, features = ["static-fs"] } -enumset = "1.1.0" +enumset.workspace = true cfg-if = "1.0" lazy_static = "1.4" libc = { version = "^0.2", default-features = false } diff --git a/lib/compiler-singlepass/Cargo.toml b/lib/compiler-singlepass/Cargo.toml index 226496a8d80..78dad398761 100644 --- a/lib/compiler-singlepass/Cargo.toml +++ b/lib/compiler-singlepass/Cargo.toml @@ -18,7 +18,7 @@ wasmer-compiler = { path = "../compiler", version = "=4.2.3", features = ["trans wasmer-types = { path = "../types", version = "=4.2.3", default-features = false, features = ["std"] } hashbrown = { version = "0.11", optional = true } gimli = { version = "0.26", optional = true } -enumset = "1.1.0" +enumset.workspace = true more-asserts = "0.2" dynasm = "1.2.3" dynasmrt = "1.2.3" diff --git a/lib/compiler/Cargo.toml b/lib/compiler/Cargo.toml index a171533d500..e32eeaf3a13 100644 --- a/lib/compiler/Cargo.toml +++ b/lib/compiler/Cargo.toml @@ -16,7 +16,7 @@ version.workspace = true wasmer-types = { path = "../types", version = "=4.2.3", default-features = false } wasmer-object = { path = "../object", version = "=4.2.3", optional = true } wasmparser = { version = "0.95", optional = true, default-features = false } -enumset = "1.1.0" +enumset.workspace = true hashbrown = { version = "0.11", optional = true } serde = { version = "1.0", features = ["derive"], optional = true } thiserror = "1.0" diff --git a/lib/types/Cargo.toml b/lib/types/Cargo.toml index 99a7bd8150d..140c8c8b76b 100644 --- a/lib/types/Cargo.toml +++ b/lib/types/Cargo.toml @@ -21,7 +21,7 @@ indexmap = { version = "1.6" } rkyv = { version = "0.7.40", features = ["indexmap", "validation", "strict"] } enum-iterator = "0.7.0" target-lexicon = { version = "0.12.2", default-features = false } -enumset = "1.1.0" +enumset.workspace = true bytecheck = "0.6.8" [dev-dependencies]