Browse Source

wasmtime-cli, obj, debug: upgrade to faerie 0.15

eliminating the faerie 0.14 dep
pull/1311/head
Pat Hickey 5 years ago
parent
commit
2f6172732f
  1. 24
      Cargo.lock
  2. 2
      Cargo.toml
  3. 2
      crates/debug/Cargo.toml
  4. 3
      crates/debug/src/write_debuginfo.rs
  5. 2
      crates/obj/Cargo.toml

24
Cargo.lock

@ -461,7 +461,7 @@ dependencies = [
"anyhow",
"cranelift-codegen",
"cranelift-module",
"faerie 0.15.0",
"faerie",
"goblin",
"target-lexicon",
]
@ -842,22 +842,6 @@ dependencies = [
name = "example-fib-debug-wasm"
version = "0.1.0"
[[package]]
name = "faerie"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74b9ed6159e4a6212c61d9c6a86bee01876b192a64accecf58d5b5ae3b667b52"
dependencies = [
"anyhow",
"goblin",
"indexmap",
"log",
"scroll",
"string-interner",
"target-lexicon",
"thiserror",
]
[[package]]
name = "faerie"
version = "0.15.0"
@ -2440,7 +2424,7 @@ name = "wasmtime-cli"
version = "0.12.0"
dependencies = [
"anyhow",
"faerie 0.14.0",
"faerie",
"file-per-thread-logger",
"filecheck",
"libc",
@ -2469,7 +2453,7 @@ name = "wasmtime-debug"
version = "0.12.0"
dependencies = [
"anyhow",
"faerie 0.14.0",
"faerie",
"gimli",
"more-asserts",
"target-lexicon",
@ -2569,7 +2553,7 @@ name = "wasmtime-obj"
version = "0.12.0"
dependencies = [
"anyhow",
"faerie 0.14.0",
"faerie",
"more-asserts",
"wasmtime-environ",
]

2
Cargo.toml

@ -33,7 +33,7 @@ wasmtime-wast = { path = "crates/wast" }
wasmtime-wasi = { path = "crates/wasi" }
wasi-common = { path = "crates/wasi-common" }
structopt = { version = "0.3.5", features = ["color", "suggestions"] }
faerie = "0.14.0"
faerie = "0.15.0"
anyhow = "1.0.19"
target-lexicon = { version = "0.10.0", default-features = false }
pretty_env_logger = "0.3.0"

2
crates/debug/Cargo.toml

@ -14,7 +14,7 @@ edition = "2018"
[dependencies]
gimli = "0.20.0"
wasmparser = "0.51.2"
faerie = "0.14.0"
faerie = "0.15.0"
wasmtime-environ = { path = "../environ", version = "0.12.0" }
target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0"

3
crates/debug/src/write_debuginfo.rs

@ -35,7 +35,8 @@ pub fn emit_dwarf(
id.name(),
Decl::section(SectionKind::Debug),
s.writer.take(),
)
)?;
Ok(())
})?;
sections.for_each_mut(|id, s| -> anyhow::Result<()> {
for reloc in &s.relocs {

2
crates/obj/Cargo.toml

@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
wasmtime-environ = { path = "../environ", version = "0.12.0" }
faerie = "0.14.0"
faerie = "0.15.0"
more-asserts = "0.2.1"
[badges]

Loading…
Cancel
Save