Update various crates' object and wast dependencies (#1908)

This somewhat cuts down on duplicate dependencies. `wast` is used in a much older version (`11.0.0`) by `witx`, and can be updated without issues there as well, but this at least gets us from 3 copies to 2.
This commit is contained in:
Till Schneidereit
2020-07-01 16:11:38 +02:00
committed by GitHub
parent de9fbfa095
commit f80c2abffb
7 changed files with 15 additions and 30 deletions

33
Cargo.lock generated
View File

@@ -108,7 +108,7 @@ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"miniz_oxide", "miniz_oxide",
"object 0.20.0", "object",
"rustc-demangle", "rustc-demangle",
] ]
@@ -497,7 +497,7 @@ dependencies = [
"anyhow", "anyhow",
"cranelift-codegen", "cranelift-codegen",
"cranelift-module", "cranelift-module",
"object 0.19.0", "object",
"target-lexicon", "target-lexicon",
] ]
@@ -1237,20 +1237,14 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
[[package]] [[package]]
name = "object" name = "object"
version = "0.19.0" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
dependencies = [ dependencies = [
"crc32fast", "crc32fast",
"indexmap", "indexmap",
] ]
[[package]]
name = "object"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.4.0" version = "1.4.0"
@@ -2380,7 +2374,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"more-asserts", "more-asserts",
"object 0.19.0", "object",
"pretty_env_logger", "pretty_env_logger",
"rayon", "rayon",
"structopt", "structopt",
@@ -2407,7 +2401,7 @@ dependencies = [
"anyhow", "anyhow",
"gimli", "gimli",
"more-asserts", "more-asserts",
"object 0.19.0", "object",
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasmparser 0.58.0", "wasmparser 0.58.0",
@@ -2509,7 +2503,7 @@ version = "0.18.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"more-asserts", "more-asserts",
"object 0.19.0", "object",
"wasmtime-environ", "wasmtime-environ",
] ]
@@ -2523,7 +2517,7 @@ dependencies = [
"ittapi-rs", "ittapi-rs",
"lazy_static", "lazy_static",
"libc", "libc",
"object 0.19.0", "object",
"scroll", "scroll",
"serde", "serde",
"target-lexicon", "target-lexicon",
@@ -2589,7 +2583,7 @@ version = "0.18.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"wasmtime", "wasmtime",
"wast 17.0.0", "wast 18.0.0",
] ]
[[package]] [[package]]
@@ -2631,15 +2625,6 @@ dependencies = [
"leb128", "leb128",
] ]
[[package]]
name = "wast"
version = "17.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a0e1c36b928fca33dbaf96235188f5fad22ee87100e26cc606bd0fbabdf1932"
dependencies = [
"leb128",
]
[[package]] [[package]]
name = "wast" name = "wast"
version = "18.0.0" version = "18.0.0"

View File

@@ -31,7 +31,7 @@ wasmtime-wast = { path = "crates/wast", version = "0.18.0" }
wasmtime-wasi = { path = "crates/wasi", version = "0.18.0" } wasmtime-wasi = { path = "crates/wasi", version = "0.18.0" }
wasi-common = { path = "crates/wasi-common", version = "0.18.0" } wasi-common = { path = "crates/wasi-common", version = "0.18.0" }
structopt = { version = "0.3.5", features = ["color", "suggestions"] } structopt = { version = "0.3.5", features = ["color", "suggestions"] }
object = { version = "0.19", default-features = false, features = ["write"] } object = { version = "0.20", default-features = false, features = ["write"] }
anyhow = "1.0.19" anyhow = "1.0.19"
target-lexicon = { version = "0.10.0", default-features = false } target-lexicon = { version = "0.10.0", default-features = false }
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"

View File

@@ -12,7 +12,7 @@ edition = "2018"
[dependencies] [dependencies]
cranelift-module = { path = "../module", version = "0.65.0" } cranelift-module = { path = "../module", version = "0.65.0" }
cranelift-codegen = { path = "../codegen", version = "0.65.0", default-features = false, features = ["std"] } cranelift-codegen = { path = "../codegen", version = "0.65.0", default-features = false, features = ["std"] }
object = { version = "0.19", default-features = false, features = ["write"] } object = { version = "0.20", default-features = false, features = ["write"] }
target-lexicon = "0.10" target-lexicon = "0.10"
anyhow = "1.0" anyhow = "1.0"

View File

@@ -14,7 +14,7 @@ edition = "2018"
[dependencies] [dependencies]
gimli = "0.21.0" gimli = "0.21.0"
wasmparser = "0.58.0" wasmparser = "0.58.0"
object = { version = "0.19", default-features = false, features = ["write"] } object = { version = "0.20", default-features = false, features = ["write"] }
wasmtime-environ = { path = "../environ", version = "0.18.0" } wasmtime-environ = { path = "../environ", version = "0.18.0" }
target-lexicon = { version = "0.10.0", default-features = false } target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0" anyhow = "1.0"

View File

@@ -13,7 +13,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
wasmtime-environ = { path = "../environ", version = "0.18.0" } wasmtime-environ = { path = "../environ", version = "0.18.0" }
object = { version = "0.19", default-features = false, features = ["write"] } object = { version = "0.20", default-features = false, features = ["write"] }
more-asserts = "0.2.1" more-asserts = "0.2.1"
[badges] [badges]

View File

@@ -24,7 +24,7 @@ wasmtime-runtime = { path = "../runtime", version = "0.18.0" }
ittapi-rs = { version = "0.1.5", optional = true } ittapi-rs = { version = "0.1.5", optional = true }
[dependencies.object] [dependencies.object]
version = "0.19.0" version = "0.20.0"
optional = true optional = true
default-features = false default-features = false
features = ['read_core', 'elf', 'std'] features = ['read_core', 'elf', 'std']

View File

@@ -13,7 +13,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0.19" anyhow = "1.0.19"
wasmtime = { path = "../wasmtime", version = "0.18.0", default-features = false } wasmtime = { path = "../wasmtime", version = "0.18.0", default-features = false }
wast = "17.0.0" wast = "18.0.0"
[badges] [badges]
maintenance = { status = "actively-developed" } maintenance = { status = "actively-developed" }