Handle type references which refer to a module defined in scope

[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 b08c6bc9d30bbc3a938033d5135d03084bab7076..6a5f3e25eb633945d4e686f89fa0d6926b601ae1 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -679,6 +679,8 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
                                Some(first_seg_str + &remaining)
                        } else if first_seg_str == "crate" {
                                Some(self.crate_name.to_owned() + &remaining)
+                       } else if self.library.modules.get(&format!("{}::{}", self.module_path, first_seg.ident)).is_some() {
+                               Some(format!("{}::{}{}", self.module_path, first_seg.ident, remaining))
                        } else { None }
                }
        }
@@ -2900,7 +2902,14 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                                        generics, &subtype, is_ref, is_mut, ptr_for_ref, true);
                                                        }
                                                } else {
-                                                       let id = subtype.rsplitn(2, ':').next().unwrap(); // Get the "Base" name of the resolved type
+                                                       let mut resolved = Vec::new();
+                                                       let id =
+                                                               if self.write_c_path_intern(&mut resolved, &$p_arg.path, generics, false, false, false, false, false) {
+                                                                       let inner = std::str::from_utf8(&resolved).unwrap();
+                                                                       inner.rsplitn(2, "::").next().unwrap()
+                                                               } else {
+                                                                       subtype.rsplitn(2, "::").next().unwrap()
+                                                               };
                                                        write!(w, "{}", id).unwrap();
                                                        write!(mangled_type, "{}", id).unwrap();
                                                        if let Some(w2) = $extra_write as Option<&mut Vec<u8>> {
@@ -2934,9 +2943,9 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                                } else { return false; }
                                                        } else if let syn::Type::Array(_) = elem {
                                                                let mut resolved = Vec::new();
-                                                               if !self.write_c_type_intern(&mut resolved, &elem, generics, false, false, true, false, true) { return false; }
+                                                               if !self.write_c_type_intern(&mut resolved, &elem, generics, false, false, false, false, false) { return false; }
                                                                let array_inner = String::from_utf8(resolved).unwrap();
-                                                               let arr_name = array_inner.split("::").last().unwrap();
+                                                               let arr_name = array_inner.rsplitn(2, "::").next().unwrap();
                                                                write!(w, "{}", arr_name).unwrap();
                                                                write!(mangled_type, "{}", arr_name).unwrap();
                                                        } else { return false; }
@@ -3063,7 +3072,9 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                        // If this is a no-export'd crate and there's only one implementation in the
                                        // whole crate, just treat it as a reference to whatever the implementor is.
                                        if with_ref_lifetime {
-                                               write!(w, "&'static crate::{}", trait_impls[0]).unwrap();
+                                               // Hope we're being printed in function generics and let rustc derive the
+                                               // type.
+                                               write!(w, "_").unwrap();
                                        } else {
                                                write!(w, "&crate::{}", trait_impls[0]).unwrap();
                                        }