From a8ecb451f146b40e8dea2f4f775ba61c49415b38 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Mon, 17 Aug 2020 15:17:39 -0700
Subject: [PATCH] wasmtime-wast: bump wast dependency to 22.0.0

---
 crates/wast/Cargo.toml  | 2 +-
 crates/wast/src/wast.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/wast/Cargo.toml b/crates/wast/Cargo.toml
index f402f25ca5..5c405d5628 100644
--- a/crates/wast/Cargo.toml
+++ b/crates/wast/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.19"
 wasmtime = { path = "../wasmtime", version = "0.19.0", default-features = false }
-wast = "21.0.0"
+wast = "22.0.0"
 
 [badges]
 maintenance = { status = "actively-developed" }
diff --git a/crates/wast/src/wast.rs b/crates/wast/src/wast.rs
index 9315c19033..f9475d0eb6 100644
--- a/crates/wast/src/wast.rs
+++ b/crates/wast/src/wast.rs
@@ -409,7 +409,7 @@ fn val_matches(actual: &Val, expected: &wast::AssertExpression) -> Result<bool>
         (Val::F32(a), wast::AssertExpression::F32(b)) => f32_matches(*a, b),
         (Val::F64(a), wast::AssertExpression::F64(b)) => f64_matches(*a, b),
         (Val::V128(a), wast::AssertExpression::V128(b)) => v128_matches(*a, b),
-        (Val::ExternRef(x), wast::AssertExpression::RefNull(HeapType::Extern)) => x.is_none(),
+        (Val::ExternRef(x), wast::AssertExpression::RefNull(Some(HeapType::Extern))) => x.is_none(),
         (Val::ExternRef(x), wast::AssertExpression::RefExtern(y)) => {
             if let Some(x) = x {
                 let x = x
@@ -421,7 +421,7 @@ fn val_matches(actual: &Val, expected: &wast::AssertExpression) -> Result<bool>
                 false
             }
         }
-        (Val::FuncRef(x), wast::AssertExpression::RefNull(HeapType::Func)) => x.is_none(),
+        (Val::FuncRef(x), wast::AssertExpression::RefNull(_)) => x.is_none(),
         _ => bail!(
             "don't know how to compare {:?} and {:?} yet",
             actual,