From cadcdf91d6fa7f649022ad536a78e09c4cd165fc Mon Sep 17 00:00:00 2001 From: Noah <33094578+coolreader18@users.noreply.github.com> Date: Mon, 25 Jan 2021 17:05:00 -0600 Subject: [PATCH 1/2] Depend on enumset instead of wasmer_enumset --- Cargo.lock | 45 +++++++++++---------- lib/compiler/Cargo.toml | 2 +- lib/compiler/src/target.rs | 2 +- lib/deprecated/runtime-core/Cargo.lock | 54 +++++++++++--------------- lib/deprecated/runtime/Cargo.lock | 54 +++++++++++--------------- 5 files changed, 68 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd5d4b5dd46..fdbbcb83015 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -710,6 +710,27 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "enumset" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3365a51d694a57eb4ee05fb3a7f11353708b1f3f1e9a3da4d003d7fcd1dd5135" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c0ab0a4d1e54dfbfef7aca606f4501af48235308449c7d985b0bbd2f8393ff" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "erased-serde" version = "0.3.12" @@ -2473,6 +2494,7 @@ dependencies = [ name = "wasmer-compiler" version = "1.0.1" dependencies = [ + "enumset", "hashbrown 0.9.1", "raw-cpuid", "serde", @@ -2482,7 +2504,6 @@ dependencies = [ "thiserror", "wasmer-types", "wasmer-vm", - "wasmer_enumset", "wasmparser", ] @@ -2788,28 +2809,6 @@ dependencies = [ "wasmer-wast", ] -[[package]] -name = "wasmer_enumset" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf088cc1f7d247fd96dff0df46fb1bbb747d8a69ae1ecd71aed55c55e354b2d8" -dependencies = [ - "num-traits", - "wasmer_enumset_derive", -] - -[[package]] -name = "wasmer_enumset_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1b32d98e11194200baf6d3f85eb2d6cfe56f6d9af0dd617f90ca48f958a88" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "wasmparser" version = "0.65.0" diff --git a/lib/compiler/Cargo.toml b/lib/compiler/Cargo.toml index c5a29cc73fd..473495dbd42 100644 --- a/lib/compiler/Cargo.toml +++ b/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" diff --git a/lib/compiler/src/target.rs b/lib/compiler/src/target.rs index c883d1d7758..34830031e15 100644 --- a/lib/compiler/src/target.rs +++ b/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; diff --git a/lib/deprecated/runtime-core/Cargo.lock b/lib/deprecated/runtime-core/Cargo.lock index 10255f3cd0d..ea1fad1c428 100644 --- a/lib/deprecated/runtime-core/Cargo.lock +++ b/lib/deprecated/runtime-core/Cargo.lock @@ -339,6 +339,27 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +[[package]] +name = "enumset" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3365a51d694a57eb4ee05fb3a7f11353708b1f3f1e9a3da4d003d7fcd1dd5135" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c0ab0a4d1e54dfbfef7aca606f4501af48235308449c7d985b0bbd2f8393ff" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -604,15 +625,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - [[package]] name = "num_cpus" version = "1.13.0" @@ -1171,6 +1183,7 @@ dependencies = [ name = "wasmer-compiler" version = "1.0.1" dependencies = [ + "enumset", "raw-cpuid", "serde", "serde_bytes", @@ -1179,7 +1192,6 @@ dependencies = [ "thiserror", "wasmer-types", "wasmer-vm", - "wasmer_enumset", "wasmparser", ] @@ -1358,28 +1370,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wasmer_enumset" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf088cc1f7d247fd96dff0df46fb1bbb747d8a69ae1ecd71aed55c55e354b2d8" -dependencies = [ - "num-traits", - "wasmer_enumset_derive", -] - -[[package]] -name = "wasmer_enumset_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1b32d98e11194200baf6d3f85eb2d6cfe56f6d9af0dd617f90ca48f958a88" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "wasmparser" version = "0.65.0" diff --git a/lib/deprecated/runtime/Cargo.lock b/lib/deprecated/runtime/Cargo.lock index b2d4e006b14..18004ccc46e 100644 --- a/lib/deprecated/runtime/Cargo.lock +++ b/lib/deprecated/runtime/Cargo.lock @@ -339,6 +339,27 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +[[package]] +name = "enumset" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3365a51d694a57eb4ee05fb3a7f11353708b1f3f1e9a3da4d003d7fcd1dd5135" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c0ab0a4d1e54dfbfef7aca606f4501af48235308449c7d985b0bbd2f8393ff" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -604,15 +625,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - [[package]] name = "num_cpus" version = "1.13.0" @@ -1171,6 +1183,7 @@ dependencies = [ name = "wasmer-compiler" version = "1.0.1" dependencies = [ + "enumset", "raw-cpuid", "serde", "serde_bytes", @@ -1179,7 +1192,6 @@ dependencies = [ "thiserror", "wasmer-types", "wasmer-vm", - "wasmer_enumset", "wasmparser", ] @@ -1365,28 +1377,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wasmer_enumset" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf088cc1f7d247fd96dff0df46fb1bbb747d8a69ae1ecd71aed55c55e354b2d8" -dependencies = [ - "num-traits", - "wasmer_enumset_derive", -] - -[[package]] -name = "wasmer_enumset_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1b32d98e11194200baf6d3f85eb2d6cfe56f6d9af0dd617f90ca48f958a88" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "wasmparser" version = "0.65.0" From b725733d9ac69251f47b2ab699e915ca9fb65c3f Mon Sep 17 00:00:00 2001 From: Noah <33094578+coolreader18@users.noreply.github.com> Date: Mon, 25 Jan 2021 17:07:58 -0600 Subject: [PATCH 2/2] Add to CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3707cf3e53d..c4ca60668f9 100644 --- a/CHANGELOG.md +++ b/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.