test: support AssertUnlinkable

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

Author: explodingcamera

crates/tinywasm/src/error.rs

@@ -45,22 +45,6 @@ pub enum Error {
 
     /// The store is not the one that the module instance was instantiated in
     InvalidStore,
-
-    /// Missing import
-    MissingImport {
-        /// The module name
-        module: String,
-        /// The import name
-        name: String,
-    },
-
-    /// Could not resolve an import
-    CouldNotResolveImport {
-        /// The module name
-        module: String,
-        /// The import name
-        name: String,
-    },
 }
 
 #[derive(Debug)]
@@ -74,7 +58,7 @@ pub enum LinkingError {
         name: String,
     },
     /// A mismatched import type was encountered
-    MismatchedImportType {
+    IncompatibleImportType {
         /// The module name
         module: String,
         /// The import name
@@ -166,7 +150,7 @@ impl LinkingError {
     pub fn message(&self) -> &'static str {
         match self {
             Self::UnknownImport { .. } => "unknown import",
-            Self::MismatchedImportType { .. } => "mismatched import type",
+            Self::IncompatibleImportType { .. } => "incompatible import type",
         }
     }
 }
@@ -202,14 +186,6 @@ impl Display for Error {
             Self::LabelStackUnderflow => write!(f, "label stack underflow"),
             Self::StackUnderflow => write!(f, "stack underflow"),
             Self::InvalidStore => write!(f, "invalid store"),
-
-            Self::MissingImport { module, name } => {
-                write!(f, "missing import: {}.{}", module, name)
-            }
-
-            Self::CouldNotResolveImport { module, name } => {
-                write!(f, "could not resolve import: {}.{}", module, name)
-            }
         }
     }
 }

crates/tinywasm/src/imports.rs

@@ -279,7 +279,7 @@ impl Imports {
     {
         if expected != actual {
             log::error!("failed to link import {}, expected {:?}, got {:?}", import.name, expected, actual);
-            return Err(crate::LinkingError::MismatchedImportType {
+            return Err(crate::LinkingError::IncompatibleImportType {
                 module: import.module.to_string(),
                 name: import.name.to_string(),
             }
@@ -299,10 +299,11 @@ impl Imports {
 
         for import in module.data.imports.iter() {
             let Some(val) = self.take(store, import) else {
-                return Err(crate::Error::MissingImport {
+                return Err(crate::LinkingError::UnknownImport {
                     module: import.module.to_string(),
                     name: import.name.to_string(),
-                });
+                }
+                .into());
             };
 
             match val {
@@ -324,7 +325,7 @@ impl Imports {
                     }
                     (Extern::Function(extern_func), ImportKind::Function(ty)) => {
                         let import_func_type = module.data.func_types.get(*ty as usize).ok_or_else(|| {
-                            crate::Error::CouldNotResolveImport {
+                            crate::LinkingError::IncompatibleImportType {
                                 module: import.module.to_string(),
                                 name: import.name.to_string(),
                             }
@@ -334,7 +335,7 @@ impl Imports {
                         imports.funcs.push(store.add_func(extern_func, *ty, idx)?);
                     }
                     _ => {
-                        return Err(crate::LinkingError::MismatchedImportType {
+                        return Err(crate::LinkingError::IncompatibleImportType {
                             module: import.module.to_string(),
                             name: import.name.to_string(),
                         }
@@ -346,7 +347,7 @@ impl Imports {
                 ResolvedExtern::Store(val) => {
                     // check if the kind matches
                     if val.kind() != (&import.kind).into() {
-                        return Err(crate::LinkingError::MismatchedImportType {
+                        return Err(crate::LinkingError::IncompatibleImportType {
                             module: import.module.to_string(),
                             name: import.name.to_string(),
                         }