Merge pull request #2056 from coolreader18/upstream-enumset

Depend on enumset instead of wasmer_enumset

CHANGELOG.md

@@ -13,6 +13,7 @@
 ### Changed
 - [#2042](https://github.com/wasmerio/wasmer/pull/2042) Parse more exotic environment variables in `wasmer run`.
 - [#2041](https://github.com/wasmerio/wasmer/pull/2041) Documentation diagrams now have a solid white background rather than a transparent background.
+- [#2056](https://github.com/wasmerio/wasmer/pull/2056) Change back to depend on the `enumset` crate instead of `wasmer_enumset`
 
 ### Fixed
 - [#2044](https://github.com/wasmerio/wasmer/pull/2044) Do not build C headers on docs.rs.

lib/compiler/Cargo.toml

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

lib/compiler/src/target.rs

@@ -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;