match token_iter.next().unwrap() {
TokenTree::Literal(lit) => {
let line = format!("{}", lit);
- if line.contains("(C-not exported)") {
+ if line.contains("(C-not exported)") || line.contains("This is not exported to bindings users") {
return ExportStatus::NoExport;
} else if line.contains("(C-not implementable)") {
return ExportStatus::NotImplementable;
'bound_loop: for bound in type_param.bounds.iter() {
if let syn::TypeParamBound::Trait(trait_bound) = bound {
if let Some(ident) = single_ident_generic_path_to_ident(&trait_bound.path) {
- match &format!("{}", ident) as &str { "Send" => continue, "Sync" => continue, _ => {} }
+ match &format!("{}", ident) as &str { "Send" => continue, "Sync" => continue, "Sized" => continue, _ => {} }
}
if path_matches_nongeneric(&trait_bound.path, &["core", "clone", "Clone"]) { continue; }
}
} else { unimplemented!(); }
for bound in bounds_iter {
- if let syn::TypeParamBound::Trait(_) = bound { unimplemented!(); }
+ if let syn::TypeParamBound::Trait(t) = bound {
+ // We only allow for `?Sized` here.
+ if let syn::TraitBoundModifier::Maybe(_) = t.modifier {} else { panic!(); }
+ assert_eq!(t.path.segments.len(), 1);
+ assert_eq!(format!("{}", t.path.segments[0].ident), "Sized");
+ }
}
break;
},
let crate_name_ident = format_ident!("{}", crate_name);
path.push(parse_quote!(#crate_name_ident));
} else if partial_path == "" && !dependencies.contains(&$ident) {
- new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix);
- let crate_name_ident = format_ident!("{}", crate_name);
- path.push(parse_quote!(#crate_name_ident));
+ new_path = format!("{}::{}{}", module_path, $ident, $path_suffix);
+ for module in module_path.split("::") {
+ path.push(syn::PathSegment { ident: syn::Ident::new(module, Span::call_site()), arguments: syn::PathArguments::None });
+ }
+ let ident_str = format_ident!("{}", $ident);
+ path.push(parse_quote!(#ident_str));
} else if format!("{}", $ident) == "self" {
let mut path_iter = partial_path.rsplitn(2, "::");
path_iter.next().unwrap();
res.insert("crate::c_types::PublicKey".to_owned());
res.insert("crate::c_types::Transaction".to_owned());
res.insert("crate::c_types::Witness".to_owned());
+ res.insert("crate::c_types::WitnessVersion".to_owned());
res.insert("crate::c_types::TxOut".to_owned());
res.insert("crate::c_types::Signature".to_owned());
res.insert("crate::c_types::RecoverableSignature".to_owned());
+ res.insert("crate::c_types::BigEndianScalar".to_owned());
res.insert("crate::c_types::Bech32Error".to_owned());
res.insert("crate::c_types::Secp256k1Error".to_owned());
res.insert("crate::c_types::IOError".to_owned());
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,
}
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,
}
}
"str" if is_ref => Some("crate::c_types::Str"),
"alloc::string::String"|"String" => Some("crate::c_types::Str"),
+ "bitcoin::Address" => Some("crate::c_types::Str"),
+
"std::time::Duration"|"core::time::Duration" => Some("u64"),
"std::time::SystemTime" => Some("u64"),
"std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some("crate::c_types::IOError"),
"bitcoin::blockdata::script::Script" if is_ref => Some("crate::c_types::u8slice"),
"bitcoin::blockdata::script::Script" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),
- "bitcoin::blockdata::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"),
+ "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"),
"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction"),
"bitcoin::Witness" => Some("crate::c_types::Witness"),
"bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut"),
"bitcoin::blockdata::block::BlockHeader" if is_ref => Some("*const [u8; 80]"),
"bitcoin::blockdata::block::Block" if is_ref => Some("crate::c_types::u8slice"),
- "bitcoin::hash_types::PubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::ScriptHash"
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
+ "bitcoin::hash_types::WPubkeyHash"|
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
+ if !is_ref => Some("crate::c_types::TwentyBytes"),
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
+ "bitcoin::hash_types::WPubkeyHash"|
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
if is_ref => Some("*const [u8; 20]"),
"bitcoin::hash_types::WScriptHash"
if is_ref => Some("*const [u8; 32]"),
"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(""),
"bitcoin::secp256k1::SecretKey" if is_ref => Some("&::bitcoin::secp256k1::SecretKey::from_slice(&unsafe { *"),
"bitcoin::secp256k1::SecretKey" if !is_ref => Some(""),
+ "bitcoin::secp256k1::Scalar" if is_ref => Some("&"),
"bitcoin::secp256k1::Scalar" if !is_ref => Some(""),
"bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("::bitcoin::secp256k1::ecdh::SharedSecret::from_bytes("),
"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(""),
"bitcoin::Witness" if is_ref => Some("&"),
"bitcoin::Witness" => Some(""),
- "bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::C_to_bitcoin_outpoint("),
+ "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::C_to_bitcoin_outpoint("),
"bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(""),
"bitcoin::network::constants::Network" => Some(""),
"bitcoin::util::address::WitnessVersion" => Some(""),
"bitcoin::blockdata::block::BlockHeader" => Some("&::bitcoin::consensus::encode::deserialize(unsafe { &*"),
"bitcoin::blockdata::block::Block" if is_ref => Some("&::bitcoin::consensus::encode::deserialize("),
- "bitcoin::hash_types::PubkeyHash" if is_ref =>
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if !is_ref =>
+ Some("bitcoin::hash_types::PubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner("),
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if is_ref =>
Some("&bitcoin::hash_types::PubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
"bitcoin::hash_types::WPubkeyHash" if is_ref =>
Some("&bitcoin::hash_types::WPubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
- "bitcoin::hash_types::ScriptHash" if is_ref =>
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if !is_ref =>
+ Some("bitcoin::hash_types::ScriptHash::from_hash(bitcoin::hashes::Hash::from_inner("),
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if is_ref =>
Some("&bitcoin::hash_types::ScriptHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
"bitcoin::hash_types::WScriptHash" if is_ref =>
Some("&bitcoin::hash_types::WScriptHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
"bitcoin::hash_types::Txid" if is_ref => Some("&::bitcoin::hash_types::Txid::from_slice(&unsafe { &*"),
"bitcoin::hash_types::Txid" if !is_ref => Some("::bitcoin::hash_types::Txid::from_slice(&"),
"bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" => Some("::bitcoin::hash_types::BlockHash::from_slice(&"),
- "bitcoin::blockdata::constants::ChainHash" => Some("::bitcoin::blockdata::constants::ChainHash::from_slice(&"),
+ "bitcoin::blockdata::constants::ChainHash" => Some("::bitcoin::blockdata::constants::ChainHash::from(&"),
"lightning::ln::PaymentHash" if !is_ref => Some("::lightning::ln::PaymentHash("),
"lightning::ln::PaymentHash" if is_ref => Some("&::lightning::ln::PaymentHash(unsafe { *"),
"lightning::ln::PaymentPreimage" if !is_ref => Some("::lightning::ln::PaymentPreimage("),
"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(".into_rust()"),
"bitcoin::secp256k1::SecretKey" if !is_ref => Some(".into_rust()"),
"bitcoin::secp256k1::SecretKey" if is_ref => Some("}[..]).unwrap()"),
- "bitcoin::secp256k1::Scalar" if !is_ref => Some(".into_rust()"),
+ "bitcoin::secp256k1::Scalar" => Some(".into_rust()"),
"bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".data)"),
"bitcoin::blockdata::script::Script" if is_ref => Some(".to_slice()))"),
"bitcoin::blockdata::script::Script" if !is_ref => Some(".into_rust())"),
"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(".into_bitcoin()"),
"bitcoin::Witness" => Some(".into_bitcoin()"),
- "bitcoin::blockdata::transaction::OutPoint" => Some(")"),
+ "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
"bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(".into_rust()"),
"bitcoin::network::constants::Network" => Some(".into_bitcoin()"),
"bitcoin::util::address::WitnessVersion" => Some(".into()"),
"bitcoin::blockdata::block::BlockHeader" => Some(" }).unwrap()"),
"bitcoin::blockdata::block::Block" => Some(".to_slice()).unwrap()"),
- "bitcoin::hash_types::PubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|
- "bitcoin::hash_types::ScriptHash"|"bitcoin::hash_types::WScriptHash"
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
+ "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
+ if !is_ref => Some(".data))"),
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
+ "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
if is_ref => Some(" }.clone()))"),
// Newtypes that we just expose in their original form.
"bitcoin::hash_types::Txid" if is_ref => Some(" }[..]).unwrap()"),
"bitcoin::hash_types::Txid" => Some(".data[..]).unwrap()"),
- "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash"|"bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".data[..]).unwrap()"),
+ "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" if !is_ref => Some(".data[..]).unwrap()"),
+ "bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".data[..])"),
"lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
|"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
|"lightning::chain::keysinterface::KeyMaterial"
"str" if is_ref => Some(""),
"alloc::string::String"|"String" => Some(""),
+ "bitcoin::Address" => Some("alloc::string::ToString::to_string(&"),
+
"std::time::Duration"|"core::time::Duration" => Some(""),
"std::time::SystemTime" => Some(""),
"std::io::Error"|"lightning::io::Error" => Some("crate::c_types::IOError::from_rust("),
"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature::from_rust(&"),
"bitcoin::secp256k1::SecretKey" if is_ref => Some(""),
"bitcoin::secp256k1::SecretKey" if !is_ref => Some("crate::c_types::SecretKey::from_rust("),
- "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar::from_rust("),
+ "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar::from_rust(&"),
"bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
"bitcoin::blockdata::script::Script" if is_ref => Some("crate::c_types::u8slice::from_slice(&"),
"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction::from_bitcoin(&"),
"bitcoin::Witness" if is_ref => Some("crate::c_types::Witness::from_bitcoin("),
"bitcoin::Witness" if !is_ref => Some("crate::c_types::Witness::from_bitcoin(&"),
- "bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::bitcoin_to_C_outpoint("),
+ "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::bitcoin_to_C_outpoint("),
"bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut::from_rust("),
"bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network::from_bitcoin("),
"bitcoin::util::address::WitnessVersion" => Some(""),
"bitcoin::hash_types::Txid" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
+ "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
+ if !is_ref => Some("crate::c_types::TwentyBytes { data: "),
+
// Newtypes that we just expose in their original form.
"bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
if is_ref => Some(""),
"alloc::string::String"|"String" if is_ref => Some(".as_str().into()"),
"alloc::string::String"|"String" => Some(".into()"),
+ "bitcoin::Address" => Some(").into()"),
+
"std::time::Duration"|"core::time::Duration" => Some(".as_secs()"),
"std::time::SystemTime" => Some(".duration_since(::std::time::SystemTime::UNIX_EPOCH).expect(\"Times must be post-1970\").as_secs()"),
"std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some(")"),
"bitcoin::blockdata::script::Script" if !is_ref => Some(".into_bytes().into()"),
"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(")"),
"bitcoin::Witness" => Some(")"),
- "bitcoin::blockdata::transaction::OutPoint" => Some(")"),
+ "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
"bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(")"),
"bitcoin::network::constants::Network" => Some(")"),
"bitcoin::util::address::WitnessVersion" => Some(".into()"),
"bitcoin::hash_types::Txid" if !is_ref => Some(".into_inner() }"),
+ "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
+ "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+ "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
+ if !is_ref => Some(".as_hash().into_inner() }"),
+
// Newtypes that we just expose in their original form.
- "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+ "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"
if is_ref => Some(".as_inner()"),
- "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+ "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"
if !is_ref => Some(".into_inner() }"),
+ "bitcoin::blockdata::constants::ChainHash" if is_ref => Some(".as_bytes() }"),
+ "bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".to_bytes() }"),
"bitcoin::secp256k1::Message" if !is_ref => Some(".as_ref().clone() }"),
"lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
|"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
fn empty_val_check_suffix_from_path(&self, full_path: &str) -> Option<&str> {
match full_path {
- "lightning::ln::PaymentSecret" => Some(".data == [0; 32]"),
"secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some(".is_null()"),
"bitcoin::secp256k1::ecdsa::Signature" => Some(".is_null()"),
_ => None
// clear for users. Thus, we default to false but override for a few
// types which had mappings defined when we were avoiding the `Option_`s.
match &resolved as &str {
- "lightning::ln::PaymentSecret" => true,
- "lightning::ln::PaymentHash" => true,
- "lightning::ln::PaymentPreimage" => true,
- "lightning::ln::channelmanager::PaymentId" => true,
- "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" => true,
"secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => true,
_ => false,
}
let inner_name = self.get_c_mangled_container_type(vec![single_contained.unwrap()], generics, "Option").unwrap();
return Some(("if ", vec![
(format!(".is_none() {{ {}::None }} else {{ {}::Some(/* WARNING: CLONING CONVERSION HERE! &Option<Enum> is otherwise un-expressable. */", inner_name, inner_name),
- format!("{}.clone().unwrap()", var_access))
+ format!("(*{}.as_ref().unwrap()).clone()", var_access))
], ") }", ContainerPrefixLocation::PerConv));
}
} else {
(format!("{} {{ None }} else {{ Some(", s), format!("unsafe {{ &mut *{} }}", var_access))
], ") }", ContainerPrefixLocation::NoPrefix)),
EmptyValExpectedTy::OptionType =>
- return Some(("{ /* ", vec![
- (format!("*/ let {}_opt = {};", var_name, var_access),
- format!("}} if {}_opt{} {{ None }} else {{ Some({{ {}_opt.take()", var_name, s, var_name))
- ], ") } }", ContainerPrefixLocation::PerConv)),
+ return Some(("{ /*", vec![
+ (format!("*/ let {}_opt = {}; if {}_opt{} {{ None }} else {{ Some({{", var_name, var_access, var_name, s),
+ format!("{{ {}_opt.take() }}", var_name))
+ ], "})} }", ContainerPrefixLocation::PerConv)),
EmptyValExpectedTy::NonPointer =>
return Some(("if ", vec![
(format!("{} {{ None }} else {{ Some(", s), format!("{}", var_access))
}
}
- fn is_real_type_array(&self, resolved_type: &str) -> Option<syn::Type> {
- if let Some(real_ty) = self.c_type_from_path(&resolved_type, true, false) {
- if real_ty.ends_with("]") && real_ty.starts_with("*const [u8; ") {
- let mut split = real_ty.split("; ");
- split.next().unwrap();
- let tail_str = split.next().unwrap();
- assert!(split.next().is_none());
- let len = usize::from_str_radix(&tail_str[..tail_str.len() - 1], 10).unwrap();
- Some(parse_quote!([u8; #len]))
- } else { None }
- } else { None }
- }
-
/// Prints a suffix to determine if a variable is empty (ie was set by write_empty_rust_val).
/// See EmptyValExpectedTy for information on return types.
fn write_empty_rust_val_check_suffix<W: std::io::Write>(&self, generics: Option<&GenericTypes>, w: &mut W, t: &syn::Type) -> EmptyValExpectedTy {
},
syn::Type::Path(p) => {
let resolved = self.resolve_path(&p.path, generics);
- if let Some(arr_ty) = self.is_real_type_array(&resolved) {
- return self.write_empty_rust_val_check_suffix(generics, w, &arr_ty);
- }
if self.crate_types.opaques.get(&resolved).is_some() {
write!(w, ".inner.is_null()").unwrap();
EmptyValExpectedTy::NonPointer
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 {
} 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) {
- assert!(!is_ref); // We don't currently support outer reference types for non-primitive inners
+ if is_ref {
+ // We don't currently support outer reference types for non-primitive inners
+ return false;
+ }
}
} else {
- assert!(!is_ref); // We don't currently support outer reference types for non-primitive inners
+ if is_ref {
+ // We don't currently support outer reference types for non-primitive inners
+ return false;
+ }
}
if !self.write_c_type_intern(w, t, generics, false, false, false, true, true) { return false; }
} else {
if self.c_type_has_inner_from_path(&subtype) {
if !self.write_c_path_intern(w, &$p_arg.path, generics, is_ref, is_mut, ptr_for_ref, false, true) { return false; }
} else {
- if let Some(arr_ty) = self.is_real_type_array(&subtype) {
- if !self.write_c_type_intern(w, &arr_ty, generics, false, true, false, false, true) { return false; }
- } else {
- // Option<T> needs to be converted to a *mut T, ie mut ptr-for-ref
- if !self.write_c_path_intern(w, &$p_arg.path, generics, true, true, true, false, true) { return false; }
- }
+ // Option<T> needs to be converted to a *mut T, ie mut ptr-for-ref
+ if !self.write_c_path_intern(w, &$p_arg.path, generics, true, true, true, false, true) { return false; }
}
} else {
write!(w, "{}", $p_arg.path.segments.last().unwrap().ident).unwrap();
}
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
}
}
projects / ldk-c-bindings / blobdiff