From 07066835dbe7140ca45aa0f0a2c2a5f814449a93 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 25 Feb 2020 13:01:54 -0800 Subject: [PATCH] Implement `PartialEq` on `FuncType`. --- crates/api/src/types.rs | 2 +- crates/c-api/src/wasi.rs | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/crates/api/src/types.rs b/crates/api/src/types.rs index 968f62e32f..8e344d5d0a 100644 --- a/crates/api/src/types.rs +++ b/crates/api/src/types.rs @@ -168,7 +168,7 @@ fn from_wasmtime_abiparam(param: &ir::AbiParam) -> Option { /// A descriptor for a function in a WebAssembly module. /// /// WebAssembly functions can have 0 or more parameters and results. -#[derive(Debug, Clone)] +#[derive(Debug, Clone, PartialEq)] pub struct FuncType { params: Box<[ValType]>, results: Box<[ValType]>, diff --git a/crates/c-api/src/wasi.rs b/crates/c-api/src/wasi.rs index b03fe2b08d..bc5456479e 100644 --- a/crates/c-api/src/wasi.rs +++ b/crates/c-api/src/wasi.rs @@ -244,11 +244,7 @@ pub unsafe extern "C" fn wasi_instance_bind_import( match (*instance).wasi.get_export(name) { Some(export) => { - if export.ty().params() != func_type.params() { - return std::ptr::null_mut(); - } - - if export.ty().results() != func_type.results() { + if export.ty() != func_type { return std::ptr::null_mut(); }