From 8507eb77087a0860d073784123432c55f906e082 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Mon, 19 Apr 2021 14:18:55 -0700
Subject: [PATCH] Use `map_or` instead of `map` and `unwrap_or` in
 `TableElement::into_raw`

---
 crates/runtime/src/table.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/runtime/src/table.rs b/crates/runtime/src/table.rs
index 8c857add45..368fdcd115 100644
--- a/crates/runtime/src/table.rs
+++ b/crates/runtime/src/table.rs
@@ -69,7 +69,7 @@ impl TableElement {
     unsafe fn into_raw(self) -> *mut u8 {
         match self {
             Self::FuncRef(e) => e as _,
-            Self::ExternRef(e) => e.map(|e| e.into_raw()).unwrap_or(ptr::null_mut()),
+            Self::ExternRef(e) => e.map_or(ptr::null_mut(), |e| e.into_raw()),
         }
     }
 }