From 580cc47e9ce9c39a1765fe101ba1c29c9f1fd1fb Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Tue, 21 May 2019 12:59:06 -0500
Subject: [PATCH] fix tests

---
 crates/tests/tests/custom_sections.rs | 4 ++--
 crates/tests/tests/spec-tests.rs      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/tests/tests/custom_sections.rs b/crates/tests/tests/custom_sections.rs
index a14bc843..a8812b7e 100644
--- a/crates/tests/tests/custom_sections.rs
+++ b/crates/tests/tests/custom_sections.rs
@@ -48,7 +48,7 @@ fn round_trip_unkown_custom_sections() {
         [(world_id.into(), world.data())]
     );
 
-    let wasm = module.emit_wasm().unwrap();
+    let wasm = module.emit_wasm().unwrap().wasm;
     let mut module = config.parse(&wasm).unwrap();
 
     let world_round_tripped = module.customs.remove_raw("hello").unwrap();
@@ -58,6 +58,6 @@ fn round_trip_unkown_custom_sections() {
     assert_eq!(new_world.data(), world.data());
     module.customs.add(new_world);
 
-    let new_wasm = module.emit_wasm().unwrap();
+    let new_wasm = module.emit_wasm().unwrap().wasm;
     assert_eq!(wasm, new_wasm);
 }
diff --git a/crates/tests/tests/spec-tests.rs b/crates/tests/tests/spec-tests.rs
index 5df66e56..e3c8c2fd 100644
--- a/crates/tests/tests/spec-tests.rs
+++ b/crates/tests/tests/spec-tests.rs
@@ -89,12 +89,14 @@ fn run(wast: &Path) -> Result<(), failure::Error> {
                     .context(format!("error parsing wasm (line {})", line))?;
                 let wasm1 = wasm
                     .emit_wasm()
-                    .context(format!("error emitting wasm (line {})", line))?;
+                    .context(format!("error emitting wasm (line {})", line))?
+                    .wasm;
                 fs::write(&path, &wasm1)?;
                 let wasm2 = config
                     .parse(&wasm1)
                     .and_then(|m| m.emit_wasm())
-                    .context(format!("error re-parsing wasm (line {})", line))?;
+                    .context(format!("error re-parsing wasm (line {})", line))?
+                    .wasm;
                 if wasm1 != wasm2 {
                     panic!("wasm module at line {} isn't deterministic", line);
                 }
@@ -122,7 +124,7 @@ fn run(wast: &Path) -> Result<(), failure::Error> {
             walrus::passes::gc::run(&mut module);
         }
 
-        let wasm = module.emit_wasm()?;
+        let wasm = module.emit_wasm()?.wasm;
         fs::write(&file, wasm)?;
     }