From c55cee41a54219a1957aaf7404f759e996e3fb9b Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Sun, 26 Jun 2022 23:23:11 +0100 Subject: [PATCH 1/2] Upgrade enumset minimum version to one that compiles --- Makefile | 4 ++++ lib/c-api/Cargo.toml | 2 +- lib/compiler/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d7678a313f5..05ce95a99df 100644 --- a/Makefile +++ b/Makefile @@ -704,3 +704,7 @@ lint: lint-formatting lint-packages install-local: package tar -C ~/.wasmer -zxvf wasmer.tar.gz + +test-minimal-versions: + rm -f Cargo.lock + cargo +nightly build --tests -Z minimal-versions --all-features \ No newline at end of file diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml index 1059fdb2261..00135ab4074 100644 --- a/lib/c-api/Cargo.toml +++ b/lib/c-api/Cargo.toml @@ -31,7 +31,7 @@ wasmer-compiler = { version = "=2.3.0", path = "../compiler" } wasmer-middlewares = { version = "=2.3.0", path = "../middlewares", optional = true } wasmer-wasi = { version = "=2.3.0", path = "../wasi", default-features = false, features = ["host-fs", "sys"], optional = true } wasmer-types = { version = "=2.3.0", path = "../types" } -enumset = "1.0" +enumset = "1.0.2" cfg-if = "1.0" lazy_static = "1.4" libc = { version = "^0.2", default-features = false } diff --git a/lib/compiler/Cargo.toml b/lib/compiler/Cargo.toml index 110308ae966..bb223c49d76 100644 --- a/lib/compiler/Cargo.toml +++ b/lib/compiler/Cargo.toml @@ -14,7 +14,7 @@ edition = "2018" wasmer-types = { path = "../types", version = "=2.3.0", default-features = false } wasmparser = { version = "0.83", optional = true, default-features = false } target-lexicon = { version = "0.12.2", default-features = false } -enumset = "1.0" +enumset = "1.0.2" hashbrown = { version = "0.11", optional = true } serde = { version = "1.0", features = ["derive"], optional = true } thiserror = "1.0" From 34aafad7c414c03991d4f3f30b6cd8dc091bcd96 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Sun, 26 Jun 2022 23:26:50 +0100 Subject: [PATCH 2/2] Add changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cd098f160d..ad7ec1c992e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,13 +9,14 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C ## **Unreleased** ### Changed -- #2946 Remove dylib,staticlib engines in favor of a single Universal engine +- [#2946](https://github.com/wasmerio/wasmer/pull/2946) Remove dylib,staticlib engines in favor of a single Universal engine - [#2949](https://github.com/wasmerio/wasmer/pull/2949) Switch back to using custom LLVM builds on CI ### Fixed - [#2963](https://github.com/wasmerio/wasmer/pull/2963) Remove accidental dependency on libwayland and libxcb in ClI - [#2942](https://github.com/wasmerio/wasmer/pull/2942) Fix clippy lints. - [#2943](https://github.com/wasmerio/wasmer/pull/2943) Fix build error on some archs by using c_char instead of i8 +- [2976](https://github.com/wasmerio/wasmer/pull/2976) Upgrade minimum enumset to one that compiles ## 2.3.0 - 2022/06/06