X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=e3ae3bdef4f9012fd2b7014466f419b7080c8e19;hb=1479016331a6f03d9aab2aee620c86b71232ba9d;hp=e85729481a39841daf9a6159b3bd51c26e02e818;hpb=78c2c48ea30e5d933c0a29c5a9e4dea47eeabf04;p=rust-lightning

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index e8572948..e3ae3bde 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -550,7 +550,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			// List of structs we map (possibly during processing of other files):
 			"ln::features::InitFeatures" if is_ref => Some(".inner) }"),
-			"ln::features::InitFeatures" if !is_ref => Some(".take_ptr()) }"),
+			"ln::features::InitFeatures" if !is_ref => Some(".take_inner()) }"),
 
 			// List of traits we map (possibly during processing of other files):
 			"crate::util::logger::Logger" => Some(""),
@@ -798,8 +798,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 		match full_path {
 			"Result" if !is_ref => {
 				Some(("match ",
-						vec![(".result_ok { true => Ok(".to_string(), format!("(*unsafe {{ Box::from_raw({}.contents.result.take_ptr()) }})", var_name)),
-						     ("), false => Err(".to_string(), format!("(*unsafe {{ Box::from_raw({}.contents.err.take_ptr()) }})", var_name))],
+						vec![(".result_ok { true => Ok(".to_string(), format!("(*unsafe {{ Box::from_raw(<*mut _>::take_ptr(&mut {}.contents.result)) }})", var_name)),
+						     ("), false => Err(".to_string(), format!("(*unsafe {{ Box::from_raw(<*mut _>::take_ptr(&mut {}.contents.err)) }})", var_name))],
 						")}"))
 			},
 			"Vec"|"Slice" if !is_ref => {
@@ -1410,7 +1410,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 				|w, decl_type, _full_path, is_ref, _is_mut| match decl_type {
 					DeclType::StructImported if is_ref && ptr_for_ref => write!(w, ").inner }}").unwrap(),
 					DeclType::StructImported if is_ref => write!(w, ".inner }}").unwrap(),
-					DeclType::StructImported if !is_ref => write!(w, ".take_ptr()) }}").unwrap(),
+					DeclType::StructImported if !is_ref => write!(w, ".take_inner()) }}").unwrap(),
 					DeclType::MirroredEnum if is_ref => write!(w, ".to_native()").unwrap(),
 					DeclType::MirroredEnum => write!(w, ".into_native()").unwrap(),
 					DeclType::Trait(_) => {},
@@ -1855,7 +1855,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			self.crate_types.templates_defined.insert(mangled_container.clone(), true);
 			let mut created_container: Vec<u8> = Vec::new();
 
-			write!(&mut created_container, "#[no_mangle]\npub type {} = ", mangled_container).unwrap();
+			write!(&mut created_container, "pub type {} = ", mangled_container).unwrap();
 			write!(&mut created_container, "{}::C{}Templ<", Self::container_templ_path(), container_type).unwrap();
 			self.write_template_generics(&mut created_container, &mut args.iter().map(|t| *t), generics, is_ref, true);
 			writeln!(&mut created_container, ">;").unwrap();