Defer wasmtime_component_linker_instance()

Author: MangoPeachGrape

crates/c-api/include/wasmtime/component/linker.h

@@ -16,9 +16,6 @@ extern "C" {
 
 typedef struct wasmtime_component_linker_t wasmtime_component_linker_t;
 
-typedef struct wasmtime_component_linker_instance_t
-    wasmtime_component_linker_instance_t;
-
 /**
  * \brief Creates a new #wasmtime_component_linker_t for the specified engine.
  *
@@ -29,27 +26,6 @@ typedef struct wasmtime_component_linker_instance_t
 WASM_API_EXTERN wasmtime_component_linker_t *
 wasmtime_component_linker_new(const wasm_engine_t *engine);
 
-/**
- * \brief Creates a builder, #wasmtime_component_linker_instance_t, for the
- * specified named instance
- *
- * \param linker the linker in which to build out the instance in
- * \param name the instance name
- * \param linker_instance_out on success, the
- *        #wasmtime_component_linker_instance_t
- *
- * \return wasmtime_error_t* on success `NULL` is returned, otherwise an error
- *         is returned which describes why the build failed.
- *
- * \note This mutably borrows the provided linker, meaning nothing else should
- * access the linker until the returned #wasmtime_component_linker_instance_t is
- * deleted. The linker also needs to stay alive as long as the returned
- * #wasmtime_component_linker_instance_t is alive.
- */
-WASM_API_EXTERN wasmtime_error_t *wasmtime_component_linker_instance(
-    wasmtime_component_linker_t *linker, const char *name,
-    wasmtime_component_linker_instance_t **linker_instance_out);
-
 /**
  * \brief Instantiates a component instance in a given #wasmtime_context_t
  *
@@ -78,15 +54,6 @@ WASM_API_EXTERN wasmtime_error_t *wasmtime_component_linker_instantiate(
 WASM_API_EXTERN void
 wasmtime_component_linker_delete(wasmtime_component_linker_t *linker);
 
-/**
- * \brief Deletes a #wasmtime_component_linker_instance_t created by
- * #wasmtime_component_linker_instance
- *
- * \param linker_instance the #wasmtime_component_linker_instance_t to delete
- */
-WASM_API_EXTERN void wasmtime_component_linker_instance_delete(
-    wasmtime_component_linker_instance_t *linker_instance);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

crates/c-api/src/component/linker.rs

@@ -1,7 +1,4 @@
-use std::ffi::{c_char, CStr};
-
-use anyhow::Context;
-use wasmtime::component::{Instance, Linker, LinkerInstance};
+use wasmtime::component::{Instance, Linker};
 
 use crate::{wasm_engine_t, wasmtime_error_t, WasmtimeStoreContextMut, WasmtimeStoreData};
 
@@ -12,11 +9,6 @@ pub struct wasmtime_component_linker_t {
     pub(crate) linker: Linker<WasmtimeStoreData>,
 }
 
-#[repr(transparent)]
-pub struct wasmtime_component_linker_instance_t<'a> {
-    pub(crate) linker_instance: LinkerInstance<'a, WasmtimeStoreData>,
-}
-
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn wasmtime_component_linker_new(
     engine: &wasm_engine_t,
@@ -26,24 +18,6 @@ pub unsafe extern "C" fn wasmtime_component_linker_new(
     })
 }
 
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn wasmtime_component_linker_instance<'a>(
-    linker: &'a mut wasmtime_component_linker_t,
-    name: *const c_char,
-    linker_instance_out: &mut *mut wasmtime_component_linker_instance_t<'a>,
-) -> Option<Box<wasmtime_error_t>> {
-    let name = unsafe { CStr::from_ptr(name) };
-    let result = name
-        .to_str()
-        .context("input name is not valid utf-8")
-        .and_then(|name| linker.linker.instance(name));
-    crate::handle_result(result, |linker_instance| {
-        *linker_instance_out = Box::into_raw(Box::new(wasmtime_component_linker_instance_t {
-            linker_instance,
-        }));
-    })
-}
-
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn wasmtime_component_linker_instantiate(
     linker: &wasmtime_component_linker_t,
@@ -60,9 +34,3 @@ pub unsafe extern "C" fn wasmtime_component_linker_delete(
     _linker: Box<wasmtime_component_linker_t>,
 ) {
 }
-
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn wasmtime_component_linker_instance_delete(
-    _linker_instance: Box<wasmtime_component_linker_instance_t>,
-) {
-}

crates/c-api/tests/component/instantiate.cc

@@ -30,14 +30,6 @@ TEST(component, instantiate) {
   const auto linker = wasmtime_component_linker_new(engine);
   EXPECT_NE(linker, nullptr);
 
-  wasmtime_component_linker_instance_t *linker_instance = nullptr;
-  error = wasmtime_component_linker_instance(linker, "a:b/c", &linker_instance);
-
-  EXPECT_EQ(error, nullptr);
-  EXPECT_NE(linker_instance, nullptr);
-
-  wasmtime_component_linker_instance_delete(linker_instance);
-
   wasmtime_component_instance_t instance = {};
   error = wasmtime_component_linker_instantiate(linker, context, component,
                                                 &instance);