X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=74379b843b9f67e751bb4a1b0ed7576a509e61e7;hb=3b0598c5e5b457b260db673fcffa2c6423354200;hp=d27c0b96b2a209794e7ecd645c16521f704a7b10;hpb=04c5ad83145b290683385b442bb575181c9376a3;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index d27c0b9..74379b8 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -343,11 +343,13 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 			($ident: expr, $path_suffix: expr) => {
 				if partial_path == "" && !dependencies.contains(&$ident) {
 					new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix);
-					path.push(syn::PathSegment { ident: format_ident!("{}", crate_name), arguments: syn::PathArguments::None });
+					let crate_name_ident = format_ident!("{}", crate_name);
+					path.push(parse_quote!(#crate_name_ident));
 				} else {
 					new_path = format!("{}{}{}", partial_path, $ident, $path_suffix);
 				}
-				path.push(syn::PathSegment { ident: $ident.clone(), arguments: syn::PathArguments::None });
+				let ident = &$ident;
+				path.push(parse_quote!(#ident));
 			}
 		}
 		match u {
@@ -386,9 +388,8 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 
 	fn insert_primitive(imports: &mut HashMap<syn::Ident, (String, syn::Path)>, id: &str) {
 		let ident = format_ident!("{}", id);
-		let mut path = syn::punctuated::Punctuated::new();
-		path.push(syn::PathSegment { ident: ident.clone(), arguments: syn::PathArguments::None });
-		imports.insert(ident, (id.to_owned(), syn::Path { leading_colon: None, segments: path }));
+		let path = parse_quote!(#ident);
+		imports.insert(ident, (id.to_owned(), path));
 	}
 
 	pub fn new(crate_name: &'mod_lifetime str, dependencies: &'mod_lifetime HashSet<syn::Ident>, module_path: &'mod_lifetime str, contents: &'crate_lft [syn::Item]) -> Self {
@@ -970,11 +971,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"Option" => Some("local_"),
 
 			"[u8; 32]" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
-			"[u8; 32]" if is_ref => Some("&"),
+			"[u8; 32]" if is_ref => Some(""),
 			"[u8; 16]" if !is_ref => Some("crate::c_types::SixteenBytes { data: "),
 			"[u8; 10]" if !is_ref => Some("crate::c_types::TenBytes { data: "),
 			"[u8; 4]" if !is_ref => Some("crate::c_types::FourBytes { data: "),
-			"[u8; 3]" if is_ref => Some("&"),
+			"[u8; 3]" if is_ref => Some(""),
 
 			"[u8]" if is_ref => Some("local_"),
 			"[usize]" if is_ref => Some("local_"),
@@ -1582,6 +1583,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 				let resolved_path = self.resolve_path(&p.path, generics);
 				if let Some(aliased_type) = self.crate_types.type_aliases.get(&resolved_path) {
 					return self.write_conversion_inline_intern(w, aliased_type, None, is_ref, is_mut, ptr_for_ref, tupleconv, prefix, sliceconv, path_lookup, decl_lookup);
+				} else if self.is_primitive(&resolved_path) {
+					if is_ref && prefix {
+						write!(w, "*").unwrap();
+					}
 				} else if let Some(c_type) = path_lookup(&resolved_path, is_ref, ptr_for_ref) {
 					write!(w, "{}", c_type).unwrap();
 				} else if self.crate_types.opaques.get(&resolved_path).is_some() {
@@ -1663,20 +1668,20 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 				|a, b, c| self.to_c_conversion_inline_prefix_from_path(a, b, c),
 				|w, decl_type, decl_path, is_ref, _is_mut| {
 					match decl_type {
-						DeclType::MirroredEnum if is_ref && ptr_for_ref => write!(w, "crate::{}::from_native(&", decl_path).unwrap(),
-						DeclType::MirroredEnum if is_ref => write!(w, "&crate::{}::from_native(&", decl_path).unwrap(),
+						DeclType::MirroredEnum if is_ref && ptr_for_ref => write!(w, "crate::{}::from_native(", decl_path).unwrap(),
+						DeclType::MirroredEnum if is_ref => write!(w, "&crate::{}::from_native(", decl_path).unwrap(),
 						DeclType::MirroredEnum => write!(w, "crate::{}::native_into(", decl_path).unwrap(),
 						DeclType::EnumIgnored|DeclType::StructImported if is_ref && ptr_for_ref && from_ptr =>
 							write!(w, "crate::{} {{ inner: unsafe {{ (", decl_path).unwrap(),
 						DeclType::EnumIgnored|DeclType::StructImported if is_ref && ptr_for_ref =>
-							write!(w, "crate::{} {{ inner: unsafe {{ ( (&(", decl_path).unwrap(),
+							write!(w, "crate::{} {{ inner: unsafe {{ ( (&(*", decl_path).unwrap(),
 						DeclType::EnumIgnored|DeclType::StructImported if is_ref =>
 							write!(w, "&crate::{} {{ inner: unsafe {{ (", decl_path).unwrap(),
 						DeclType::EnumIgnored|DeclType::StructImported if !is_ref && from_ptr =>
 							write!(w, "crate::{} {{ inner: ", decl_path).unwrap(),
 						DeclType::EnumIgnored|DeclType::StructImported if !is_ref =>
 							write!(w, "crate::{} {{ inner: Box::into_raw(Box::new(", decl_path).unwrap(),
-						DeclType::Trait(_) if is_ref => write!(w, "&").unwrap(),
+						DeclType::Trait(_) if is_ref => write!(w, "").unwrap(),
 						DeclType::Trait(_) if !is_ref => {},
 						_ => panic!("{:?}", decl_path),
 					}