Merge pull request #2006 from wasmerio/fix/enumset-issue-by-using-fork

Use fork of enumset to fix `syn` issue

Author: syrusakbary

CHANGELOG.md

@@ -11,6 +11,7 @@
 - [#2005](https://github.com/wasmerio/wasmer/pull/2005) Added the arguments `alias` and `optional` to `WasmerEnv` derive's `export` attribute.
 
 ### Changed
+- [#2006](https://github.com/wasmerio/wasmer/pull/2006) Use `wasmer_enumset`, a fork of the `enumset` crate to work around a breaking change in `syn`
 - [#1985](https://github.com/wasmerio/wasmer/pull/1985) Bump minimum supported Rust version to 1.48
 
 ### Fixed

Cargo.lock

@@ -15,7 +15,7 @@ wasmer-vm = { path = "../vm", version = "1.0.0" }
 wasmer-types = { path = "../wasmer-types", version = "1.0.0", default-features = false }
 wasmparser = { version = "0.65", optional = true, default-features = false }
 target-lexicon = { version = "0.11", default-features = false }
-enumset = "1.0"
+wasmer_enumset = "1.0"
 hashbrown = { version = "0.9", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 thiserror = "1.0"

lib/compiler/Cargo.toml

@@ -2,11 +2,11 @@
 use crate::error::ParseCpuFeatureError;
 use crate::lib::std::str::FromStr;
 use crate::lib::std::string::{String, ToString};
-use enumset::{EnumSet, EnumSetType};
 pub use target_lexicon::{
     Architecture, BinaryFormat, CallingConvention, Endianness, OperatingSystem, PointerWidth,
     Triple,
 };
+use wasmer_enumset::{EnumSet, EnumSetType};
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use raw_cpuid::CpuId;