From e2317c5b1d934697c5cdb4324b6f0174699bad82 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 26 Feb 2020 10:00:05 -0800 Subject: [PATCH] Update the `wat` and `wast` crates Now with support for annotations, plus a few minor bug fixes --- Cargo.lock | 12 ++++++------ crates/api/Cargo.toml | 2 +- crates/wast/Cargo.toml | 2 +- crates/wast/src/wast.rs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 380ef5810723..0b8216ff977d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2231,7 +2231,7 @@ version = "0.9.0" dependencies = [ "anyhow", "wasmtime", - "wast 8.0.0", + "wast 9.0.0", ] [[package]] @@ -2245,20 +2245,20 @@ dependencies = [ [[package]] name = "wast" -version = "8.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9df3d716118a503b2f6bbb6ff46b21997ab0cc167b01de7a188e45e4b01e8d" +checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a927b35badc29c97d97e82689eef7f72fc936d884b3391804c1bb6cd2bdccbb" +checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6" dependencies = [ - "wast 8.0.0", + "wast 9.0.0", ] [[package]] diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 143240f47129..fa7f29d99649 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -22,7 +22,7 @@ cfg-if = "0.1.9" backtrace = "0.3.42" rustc-demangle = "0.1.16" lazy_static = "1.4" -wat = { version = "1.0.8", optional = true } +wat = { version = "1.0.10", optional = true } [target.'cfg(target_os = "windows")'.dependencies] winapi = "0.3.7" diff --git a/crates/wast/Cargo.toml b/crates/wast/Cargo.toml index 1dd69c2694cb..afa7a35c6ba0 100644 --- a/crates/wast/Cargo.toml +++ b/crates/wast/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [dependencies] anyhow = "1.0.19" wasmtime = { path = "../api", version = "0.9.0" } -wast = "8.0.0" +wast = "9.0.0" [badges] maintenance = { status = "actively-developed" } diff --git a/crates/wast/src/wast.rs b/crates/wast/src/wast.rs index dff4bec0ed68..621177b0daae 100644 --- a/crates/wast/src/wast.rs +++ b/crates/wast/src/wast.rs @@ -240,7 +240,7 @@ impl WastContext { match directive { Module(mut module) => { let binary = module.encode()?; - self.module(module.name.map(|s| s.name()), &binary)?; + self.module(module.id.map(|s| s.name()), &binary)?; } Register { span: _,