Update to wasmparser 0.51

wasmparser::BinaryReaderError now encapsulates its fields, so call the
accessors rather than destructuring to get the fields.
This commit is contained in:
Josh Triplett
2020-02-22 11:11:48 -08:00
parent 09c6c5db44
commit 5e05aa1b03
2 changed files with 6 additions and 4 deletions

View File

@@ -11,7 +11,7 @@ keywords = ["webassembly", "wasm"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
wasmparser = { version = "0.49.0", default-features = false } wasmparser = { version = "0.51.0", default-features = false }
cranelift-codegen = { path = "../cranelift-codegen", version = "0.58.0", default-features = false } cranelift-codegen = { path = "../cranelift-codegen", version = "0.58.0", default-features = false }
cranelift-entity = { path = "../cranelift-entity", version = "0.58.0" } cranelift-entity = { path = "../cranelift-entity", version = "0.58.0" }
cranelift-frontend = { path = "../cranelift-frontend", version = "0.58.0", default-features = false } cranelift-frontend = { path = "../cranelift-frontend", version = "0.58.0", default-features = false }

View File

@@ -55,7 +55,7 @@ pub enum WasmError {
#[error("Invalid input WebAssembly code at offset {offset}: {message}")] #[error("Invalid input WebAssembly code at offset {offset}: {message}")]
InvalidWebAssembly { InvalidWebAssembly {
/// A string describing the validation error. /// A string describing the validation error.
message: &'static str, message: std::string::String,
/// The bytecode offset where the error occurred. /// The bytecode offset where the error occurred.
offset: usize, offset: usize,
}, },
@@ -90,8 +90,10 @@ macro_rules! wasm_unsupported {
impl From<BinaryReaderError> for WasmError { impl From<BinaryReaderError> for WasmError {
/// Convert from a `BinaryReaderError` to a `WasmError`. /// Convert from a `BinaryReaderError` to a `WasmError`.
fn from(e: BinaryReaderError) -> Self { fn from(e: BinaryReaderError) -> Self {
let BinaryReaderError { message, offset } = e; Self::InvalidWebAssembly {
Self::InvalidWebAssembly { message, offset } message: e.message().into(),
offset: e.offset(),
}
} }
} }