X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=dc8c3b939d3e3c2bf737c60b451ca55c9fedf3cb;hb=3e06be96893dc608b6de44f2041869873b56e41d;hp=e45fdca095ddb5552cb72f95d81bc631af2b0ff1;hpb=4f282d4cdae9b2e79e4fd604b629517898f02262;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index e45fdca..dc8c3b9 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -594,13 +594,8 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 					}
 				},
 				syn::Item::Trait(t) => {
-					match export_status(&t.attrs) {
-						ExportStatus::Export|ExportStatus::NotImplementable => {
-							if let syn::Visibility::Public(_) = t.vis {
-								declared.insert(t.ident.clone(), DeclType::Trait(t));
-							}
-						},
-						_ => continue,
+					if let syn::Visibility::Public(_) = t.vis {
+						declared.insert(t.ident.clone(), DeclType::Trait(t));
 					}
 				},
 				syn::Item::Mod(m) => {
@@ -864,6 +859,8 @@ pub struct CrateTypes<'a> {
 	clonable_types: RefCell<HashSet<String>>,
 	/// Key impls Value
 	pub trait_impls: HashMap<String, Vec<String>>,
+	/// Value impls Key
+	pub traits_impld: HashMap<String, Vec<String>>,
 	/// The full set of modules in the crate(s)
 	pub lib_ast: &'a FullLibraryAST,
 }
@@ -874,7 +871,8 @@ impl<'a> CrateTypes<'a> {
 			opaques: HashMap::new(), mirrored_enums: HashMap::new(), traits: HashMap::new(),
 			type_aliases: HashMap::new(), reverse_alias_map: HashMap::new(),
 			templates_defined: RefCell::new(HashMap::default()), priv_structs: HashMap::new(),
-			clonable_types: RefCell::new(initial_clonable_types()), trait_impls: HashMap::new(),
+			clonable_types: RefCell::new(initial_clonable_types()),
+			trait_impls: HashMap::new(), traits_impld: HashMap::new(),
 			template_file: RefCell::new(template_file), lib_ast: &libast,
 		}
 	}
@@ -2131,7 +2129,19 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 					if let Some(decl_type) = self.types.maybe_resolve_declared(ident) {
 						decl_lookup(w, decl_type, &self.maybe_resolve_ident(ident).unwrap(), is_ref, is_mut);
 					} else { unimplemented!(); }
-				} else { unimplemented!(); }
+				} else {
+					if let Some(trait_impls) = self.crate_types.traits_impld.get(&resolved_path) {
+						if trait_impls.len() == 1 {
+							// 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.
+							let implementor = self.crate_types.opaques.get(&trait_impls[0]).unwrap();
+							decl_lookup(w, &DeclType::StructImported { generics: &implementor.1 }, &trait_impls[0], true, is_mut);
+							return;
+						}
+					}
+					unimplemented!();
+				}
 			},
 			syn::Type::Array(a) => {
 				if let syn::Type::Path(p) = &*a.elem {
@@ -2671,17 +2681,14 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 				} else { unimplemented!(); }
 			} else if let syn::Type::Path(p_arg) = t {
 				if let Some(resolved) = self.maybe_resolve_path(&p_arg.path, generics) {
-					if !self.is_primitive(&resolved) {
+					if !self.is_primitive(&resolved) && self.c_type_from_path(&resolved, false, false).is_none() {
 						if is_ref {
 							// We don't currently support outer reference types for non-primitive inners
 							return false;
 						}
 					}
 				} else {
-					if is_ref {
-						// We don't currently support outer reference types for non-primitive inners
-						return false;
-					}
+					return false;
 				}
 				if !self.write_c_type_intern(w, t, generics, false, false, false, true, true) { return false; }
 			} else {
@@ -2969,6 +2976,18 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			}
 			true
 		} else {
+			if let Some(trait_impls) = self.crate_types.traits_impld.get(&full_path) {
+				if trait_impls.len() == 1 {
+					// 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();
+					} else {
+						write!(w, "&crate::{}", trait_impls[0]).unwrap();
+					}
+					return true;
+				}
+			}
 			false
 		}
 	}