InstanceType no longer has lifetime

Author: pchickey

crates/wasmtime/src/runtime/component/instance.rs

@@ -10,7 +10,7 @@ use crate::prelude::*;
 use crate::runtime::vm::component::{ComponentInstance, OwnedComponentInstance};
 use crate::runtime::vm::{CompiledModuleId, VMFuncRef};
 use crate::store::{StoreOpaque, Stored};
-use crate::{AsContext, AsContextMut, Engine, Module, StoreContextMut};
+use crate::{AsContextMut, Engine, Module, StoreContextMut};
 use alloc::sync::Arc;
 use core::marker;
 use core::ptr::NonNull;
@@ -364,8 +364,8 @@ impl Instance {
     }
 
     #[doc(hidden)]
-    pub fn instance_type<'a, T>(&self, store: &'a crate::Store<T>) -> InstanceType<'a> {
-        let data = store.as_context().0[self.0].as_ref().unwrap();
+    pub fn instance_type(&self, mut store: impl AsContextMut) -> InstanceType {
+        let data = store.as_context_mut().0[self.0].as_ref().unwrap();
         data.ty()
     }
 }

crates/wasmtime/src/runtime/component/linker.rs

@@ -215,8 +215,8 @@ impl<T> Linker<T> {
         let ctype = types::Component::from(
             component.ty(),
             &InstanceType {
-                types: cx.types,
-                resources: &cx.imported_resources,
+                types: cx.types.clone(),
+                resources: cx.imported_resources.clone(),
             },
         );
         // Now that all imports are known to be defined and satisfied by this

crates/wasmtime/src/runtime/component/types.rs

@@ -727,7 +727,7 @@ impl ComponentFunc {
     }
 
     #[doc(hidden)]
-    pub fn typecheck<Params, Return>(&self, cx: &InstanceType<'_>) -> anyhow::Result<()>
+    pub fn typecheck<Params, Return>(&self, cx: &InstanceType) -> anyhow::Result<()>
     where
         Params: crate::component::ComponentNamedList + crate::component::Lower,
         Return: crate::component::ComponentNamedList + crate::component::Lift,
@@ -831,7 +831,7 @@ impl Component {
 
     /// Get the InstanceType, a helper representation used for typechecking
     #[doc(hidden)]
-    pub fn instance_type(&self) -> InstanceType<'_> {
+    pub fn instance_type(&self) -> InstanceType {
         self.0.instance()
     }
 }