From c0a1af94cfd2a33aa6c0e52d18fc5661baa0f9d8 Mon Sep 17 00:00:00 2001
From: Pat Hickey <phickey@fastly.com>
Date: Thu, 21 Oct 2021 15:07:32 -0700
Subject: [PATCH] fix trap behavior

---
 crates/wasmtime/src/trap.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/wasmtime/src/trap.rs b/crates/wasmtime/src/trap.rs
index 61da2dcce5..39f557dcf8 100644
--- a/crates/wasmtime/src/trap.rs
+++ b/crates/wasmtime/src/trap.rs
@@ -385,7 +385,10 @@ impl std::error::Error for Trap {
 
 impl From<anyhow::Error> for Trap {
     fn from(e: anyhow::Error) -> Trap {
-        Box::<dyn std::error::Error + Send + Sync>::from(e).into()
+        match e.downcast::<Trap>() {
+            Ok(trap) => trap,
+            Err(e) => Box::<dyn std::error::Error + Send + Sync>::from(e).into(),
+        }
     }
 }