Call methods explicitly on traits to avoid to deref recursion

[ldk-c-bindings] / c-bindings-gen / src / types.rs

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index ed26df709eab3a55ca5ccc5a0830b812b597c60f..efd6b9afcb24e48bbfef296dcb5e01984816a6b4 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -1854,6 +1854,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                } else if let syn::Type::Reference(r) = &*s.elem {
                                        if let syn::Type::Path(p) = &*r.elem {
                                                write!(w, "{}", sliceconv(self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics)), None)).unwrap();
+                                       } else if let syn::Type::Slice(_) = &*r.elem {
+                                               write!(w, "{}", sliceconv(false, None)).unwrap();
                                        } else { unimplemented!(); }
                                } else if let syn::Type::Tuple(t) = &*s.elem {
                                        assert!(!t.elems.is_empty());
@@ -1920,7 +1922,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                DeclType::EnumIgnored|DeclType::StructImported if !is_ref =>
                                                        write!(w, "crate::{} {{ inner: ObjOps::heap_alloc(", decl_path).unwrap(),
                                                DeclType::Trait(_) if is_ref => write!(w, "").unwrap(),
-                                               DeclType::Trait(_) if !is_ref => {},
+                                               DeclType::Trait(_) if !is_ref => write!(w, "Into::into(").unwrap(),
                                                _ => panic!("{:?}", decl_path),
                                        }
                                });
@@ -1946,7 +1948,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                // for use when a Rust trait method returns an associated type.
                                                // Because all of our C traits implement From<RustTypesImplementingTraits>
                                                // we can just call .into() here and be done.
-                                               write!(w, ".into()").unwrap()
+                                               write!(w, ")").unwrap()
                                        },
                                        _ => unimplemented!(),
                                });
@@ -2643,6 +2645,20 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                } else { return false; };
                                                write!(w, "{}::{}", Self::generated_container_path(), mangled_container).unwrap();
                                                self.check_create_container(mangled_container, "Vec", vec![&*r.elem], generics, false)
+                                       } else if let syn::Type::Slice(sl2) = &*r.elem {
+                                               if let syn::Type::Reference(r2) = &*sl2.elem {
+                                                       if let syn::Type::Path(p) = &*r2.elem {
+                                                               // Slices with slices with opaque types (with is_owned flags) are mapped as non-ref Vecs
+                                                               let resolved = self.resolve_path(&p.path, generics);
+                                                               let mangled_container = if let Some(ident) = self.crate_types.opaques.get(&resolved) {
+                                                                       format!("CVec_CVec_{}ZZ", ident)
+                                                               } else { return false; };
+                                                               write!(w, "{}::{}", Self::generated_container_path(), mangled_container).unwrap();
+                                                               let inner = &r2.elem;
+                                                               let vec_ty: syn::Type = syn::parse_quote!(Vec<#inner>);
+                                                               self.check_create_container(mangled_container, "Vec", vec![&vec_ty], generics, false)
+                                                       } else { false }
+                                               } else { false }
                                        } else { false }
                                } else if let syn::Type::Tuple(_) = &*s.elem {
                                        let mut args = syn::punctuated::Punctuated::<_, syn::token::Comma>::new();