Update wasmparser dependency (bytecodealliance#912)

* Update wasmparser dependency Closes bytecodealliance#905 * Fix lightbeam compilation
cfallin · Feb 6, 2020 · 9dffaf9 · 9dffaf9
1 parent c860edc
commit 9dffaf9
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 182 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 wasmtime-runtime = { path = "../runtime", version = "0.9.0" }
 wasmtime-environ = { path = "../environ", version = "0.9.0" }
 wasmtime-jit = { path = "../jit", version = "0.9.0" }
-wasmparser = { version = "0.47.0", default-features = false }
+wasmparser = "0.51.0"
 target-lexicon = { version = "0.10.0", default-features = false }
 anyhow = "1.0.19"
 region = "2.0.0"

diff --git a/crates/debug/Cargo.toml b/crates/debug/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 
 [dependencies]
 gimli = "0.19.0"
-wasmparser = "0.47.0"
+wasmparser = "0.51.0"
 faerie = "0.14.0"
 wasmtime-environ = { path = "../environ", version = "0.9.0" }
 target-lexicon = { version = "0.10.0", default-features = false }

diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
@@ -16,7 +16,7 @@ anyhow = "1.0"
 cranelift-codegen = { version = "0.56", features = ["enable-serde"] }
 cranelift-entity = { version = "0.56", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.56", features = ["enable-serde"] }
-wasmparser = "0.47.0"
+wasmparser = "0.51.0"
 lightbeam = { path = "../lightbeam", optional = true, version = "0.9.0" }
 indexmap = "1.0.2"
 rayon = "1.2.1"

diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml
@@ -14,7 +14,7 @@ arbitrary = { version = "0.3.2", features = ["derive"] }
 binaryen = "0.8.2"
 env_logger = { version = "0.7.1", optional = true }
 log = "0.4.8"
-wasmparser = "0.47.0"
+wasmparser = "0.51.0"
 wasmprinter = "0.2.0"
 wasmtime = { path = "../api", version = "0.9.0" }
 

diff --git a/crates/interface-types/Cargo.toml b/crates/interface-types/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.19"
 walrus = "0.13"
-wasmparser = { version = "0.47.0", default-features = false }
+wasmparser = "0.51.0"
 wasm-webidl-bindings = "0.6"
 wasmtime = { path = "../api", version = "0.9.0" }
 wasmtime-jit = { path = "../jit", version = "0.9.0" }

diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml
@@ -22,7 +22,7 @@ wasmtime-debug = { path = "../debug", version = "0.9.0" }
 region = "2.0.0"
 thiserror = "1.0.4"
 target-lexicon = { version = "0.10.0", default-features = false }
-wasmparser = { version = "0.47.0", default-features = false }
+wasmparser = "0.51.0"
 more-asserts = "0.2.1"
 anyhow = "1.0"
 cfg-if = "0.1.9"

diff --git a/crates/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 smallvec = "1.0.0"
 dynasm = "0.5.2"
 dynasmrt = "0.5.2"
-wasmparser = "0.47.0"
+wasmparser = "0.51.0"
 memoffset = "0.5.3"
 itertools = "0.8.2"
 capstone = "0.6.0"

diff --git a/crates/lightbeam/src/error.rs b/crates/lightbeam/src/error.rs
@@ -19,8 +19,7 @@ pub enum Error {
 
 impl From<BinaryReaderError> for Error {
     fn from(e: BinaryReaderError) -> Self {
-        let BinaryReaderError { message, offset } = e;
-        Error::Input(format!("At wasm offset {}: {}", offset, message))
+        Error::Input(format!("At wasm offset {}: {}", e.offset(), e.message()))
     }
 }
 

diff --git a/crates/lightbeam/src/function_body.rs b/crates/lightbeam/src/function_body.rs
@@ -73,10 +73,7 @@ where
 
     let mut body = Vec::new();
     for i in microwasm_conv {
-        match i {
-            Ok(v) => body.extend(v),
-            Err(e) => return Err(Error::Microwasm(e.message.to_string())),
-        };
+        body.extend(i?);
     }
 
     translate(session, reloc_sink, func_idx, body)?;