typechecking not works???

Author: pchickey

crates/wit-bindgen/src/lib.rs

@@ -707,25 +707,24 @@ pub fn new(
 ) -> {wt}::Result<{struct_name}Indices> {{
     let instance = component.get_export_index(None, \"{instance_name}\")
         .ok_or_else(|| anyhow::anyhow!(\"no exported instance named `{instance_name}`\"))?;
-    let instancetype = ctype.instance_type();
-    Self::_new(instancetype, |name| component.get_export_index(Some(&instance), name))
+    let instance_type = ctype.instance_type();
+    Self::_new(&instance_type, |name| component.get_export_index(Some(&instance), name))
 }}
 
 /// This constructor is similar to [`{struct_name}Indices::new`] except that it
 /// performs string lookups after instantiation time.
-pub fn new_instance<T>(
-    store: &{wt}::Store<T>,
+pub fn new_instance(
+    mut store: impl {wt}::AsContextMut,
     instance: &{wt}::component::Instance,
 ) -> {wt}::Result<{struct_name}Indices> {{
-    let store = &store;
-    let instance_export = instance.get_export_index(store, None, \"{instance_name}\")
+    let instance_export = instance.get_export_index(&mut store, None, \"{instance_name}\")
         .ok_or_else(|| anyhow::anyhow!(\"no exported instance named `{instance_name}`\"))?;
-    let instancetype = instance.instance_type(store);
-    Self::_new(instancetype, |name| instance.get_export_index(store, Some(&instance_export), name))
+    let instance_type = instance.instance_type(&mut store);
+    Self::_new(&instance_type, |name| instance.get_export_index(&mut store, Some(&instance_export), name))
 }}
 
 fn _new(
-    _instancetype: {wt}::component::__internal::InstanceType<'_>,
+    _instance_type: &{wt}::component::__internal::InstanceType,
     mut lookup: impl FnMut (&str) -> Option<{wt}::component::ComponentExportIndex>,
 ) -> {wt}::Result<{struct_name}Indices> {{
     let mut lookup = move |name| {{
@@ -763,7 +762,7 @@ fn _new(
                             let mut store = store.as_context_mut();
                             let _ = &mut store;
                             let _instance = instance;
-                            let _instance_type = _instance.instance_type(&store);
+                            let _instance_type = _instance.instance_type(&mut store);
                     "
                 );
                 let mut fields = Vec::new();
@@ -1070,6 +1069,7 @@ impl<_T> {camel}Pre<_T> {{
                     instance: &{wt}::component::Instance,
                 ) -> {wt}::Result<Self> {{
                     let _instance = instance;
+                    let _instance_type = _instance.instance_type(&mut store);
             ",
         );
         for (name, field) in self.exports.fields.iter() {
@@ -1131,8 +1131,8 @@ impl<_T> {camel}Pre<_T> {{
                     mut store: impl {wt}::AsContextMut,
                     instance: &{wt}::component::Instance,
                 ) -> {wt}::Result<{camel}> {{
-                    let indices = {camel}Indices::new_instance(store, instance)?;
-                    indices.load(store, instance)
+                    let indices = {camel}Indices::new_instance(&mut store, instance)?;
+                    indices.load(&mut store, instance)
                 }}
             ",
         );