feat: Update and use workspace gimli

This commit is contained in:
Edoardo Marangoni
2024-08-22 17:12:07 +02:00
parent bb187b9284
commit e7b7c8fb42
4 changed files with 12 additions and 17 deletions

13
Cargo.lock generated
View File

@ -1961,17 +1961,6 @@ dependencies = [
"syn 2.0.74", "syn 2.0.74",
] ]
[[package]]
name = "gimli"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
dependencies = [
"fallible-iterator 0.2.0",
"indexmap 1.9.3",
"stable_deref_trait",
]
[[package]] [[package]]
name = "gimli" name = "gimli"
version = "0.28.1" version = "0.28.1"
@ -6869,7 +6858,7 @@ dependencies = [
"dynasm", "dynasm",
"dynasmrt", "dynasmrt",
"enumset", "enumset",
"gimli 0.26.2", "gimli 0.28.1",
"hashbrown 0.11.2", "hashbrown 0.11.2",
"lazy_static", "lazy_static",
"more-asserts", "more-asserts",

View File

@ -110,6 +110,7 @@ toml = {version = "0.5.9", features = ["preserve_order"]}
indexmap = "2" indexmap = "2"
serde_yaml = "0.9.34" serde_yaml = "0.9.34"
libc = { version = "^0.2", default-features = false } libc = { version = "^0.2", default-features = false }
gimli = { version = "0.28.1"}
[build-dependencies] [build-dependencies]
test-generator = { path = "tests/lib/test-generator" } test-generator = { path = "tests/lib/test-generator" }

View File

@ -26,7 +26,7 @@ cranelift-codegen = { version = "0.110.2", default-features = false, features =
"x86", "x86",
"arm64", "arm64",
"riscv64", "riscv64",
"isle-in-source-tree" "isle-in-source-tree",
] } ] }
cranelift-frontend = { version = "0.110.2", default-features = false } cranelift-frontend = { version = "0.110.2", default-features = false }
itertools = "0.12.0" itertools = "0.12.0"
@ -34,7 +34,7 @@ tracing = "0.1"
hashbrown = { version = "0.11", optional = true } hashbrown = { version = "0.11", optional = true }
rayon = { version = "1.5", optional = true } rayon = { version = "1.5", optional = true }
more-asserts = "0.2" more-asserts = "0.2"
gimli = { version = "0.28.0", optional = true } gimli = { workspace = true, optional = true }
smallvec = "1.6" smallvec = "1.6"
target-lexicon = { version = "0.12.2", default-features = false } target-lexicon = { version = "0.12.2", default-features = false }

View File

@ -14,10 +14,15 @@ rust-version.workspace = true
version.workspace = true version.workspace = true
[dependencies] [dependencies]
wasmer-compiler = { path = "../compiler", version = "=4.3.6", features = ["translator", "compiler"], default-features = false } wasmer-compiler = { path = "../compiler", version = "=4.3.6", features = [
wasmer-types = { path = "../types", version = "=4.3.6", default-features = false, features = ["std"] } "translator",
"compiler",
], default-features = false }
wasmer-types = { path = "../types", version = "=4.3.6", default-features = false, features = [
"std",
] }
hashbrown = { version = "0.11", optional = true } hashbrown = { version = "0.11", optional = true }
gimli = { version = "0.26", optional = true } gimli = { workspace = true, optional = true }
enumset.workspace = true enumset.workspace = true
more-asserts = "0.2" more-asserts = "0.2"
dynasm = "1.2.3" dynasm = "1.2.3"