X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=ee800dbcf49c0049a70cf9d7451ec9795a43165d;hb=9c9d5baa90383947f6e3ea494a038c840cb6a1c0;hp=42fd470da778207a5dcd039c56dc869e670b3c1d;hpb=257e3956c377b9610bc01925ceecca450d8735cc;p=ldk-c-bindings diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs index 42fd470..ee800db 100644 --- a/c-bindings-gen/src/main.rs +++ b/c-bindings-gen/src/main.rs @@ -18,7 +18,7 @@ //! It also generates relevant memory-management functions and free-standing functions with //! parameters mapped. -use std::collections::{HashMap, hash_map}; +use std::collections::{HashMap, hash_map, HashSet}; use std::env; use std::fs::File; use std::io::{Read, Write}; @@ -102,7 +102,7 @@ fn maybe_convert_trait_impl(w: &mut W, trait_path: &syn::Path }, "lightning::util::ser::Readable"|"lightning::util::ser::ReadableArgs"|"lightning::util::ser::MaybeReadable" => { // Create the Result syn::Type - let mut res_ty: syn::Type = parse_quote!(Result<#for_ty, ::ln::msgs::DecodeError>); + let mut res_ty: syn::Type = parse_quote!(Result<#for_ty, lightning::ln::msgs::DecodeError>); writeln!(w, "#[no_mangle]").unwrap(); writeln!(w, "/// Read a {} from a byte array, created by {}_write", for_obj, for_obj).unwrap(); @@ -151,7 +151,7 @@ fn maybe_convert_trait_impl(w: &mut W, trait_path: &syn::Path } else { unreachable!(); } } else { unreachable!(); } } else if t == "lightning::util::ser::MaybeReadable" { - res_ty = parse_quote!(Result, ::ln::msgs::DecodeError>); + res_ty = parse_quote!(Result, lightning::ln::msgs::DecodeError>); } write!(w, ") -> ").unwrap(); types.write_c_type(w, &res_ty, Some(generics), false); @@ -244,14 +244,15 @@ macro_rules! walk_supertraits { ($t: expr, $types: expr, ($( $($pat: pat)|* => $ let types_opt: Option<&TypeResolver> = $types; if let Some(types) = types_opt { if let Some(path) = types.maybe_resolve_path(&supertrait.path, None) { - match (&path as &str, &supertrait.path.segments.iter().last().unwrap().ident) { + let last_seg = supertrait.path.segments.iter().last().unwrap(); + match (&path as &str, &last_seg.ident, &last_seg.arguments) { $( $($pat)|* => $e, )* } continue; } } if let Some(ident) = supertrait.path.get_ident() { - match (&format!("{}", ident) as &str, &ident) { + match (&format!("{}", ident) as &str, &ident, &syn::PathArguments::None) { $( $($pat)|* => $e, )* } } else if types_opt.is_some() { @@ -270,7 +271,7 @@ macro_rules! get_module_type_resolver { let mut module_iter = module.rsplitn(2, "::"); module_iter.next().unwrap(); let module = module_iter.next().unwrap(); - let imports = ImportResolver::new(module.splitn(2, "::").next().unwrap(), &$crate_types.lib_ast.dependencies, + let imports = ImportResolver::new(module.splitn(2, "::").next().unwrap(), &$crate_types.lib_ast, module, &$crate_types.lib_ast.modules.get(module).unwrap().items); TypeResolver::new(module, imports, $crate_types) } } @@ -292,14 +293,14 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty } writeln_docs(w, &t.attrs, ""); - let mut gen_types = GenericTypes::new(None); + let mut gen_types = GenericTypes::new(Some(format!("{}::{}", types.module_path, trait_name))); // Add functions which may be required for supertrait implementations. // Due to borrow checker limitations, we only support one in-crate supertrait here. let supertrait_name; let supertrait_resolver; walk_supertraits!(t, Some(&types), ( - (s, _i) => { + (s, _i, _) => { if let Some(supertrait) = types.crate_types.traits.get(s) { supertrait_name = s.to_string(); supertrait_resolver = get_module_type_resolver!(supertrait_name, types.crate_libs, types.crate_types); @@ -385,20 +386,20 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty } // Add functions which may be required for supertrait implementations. walk_supertraits!(t, Some(&types), ( - ("Clone", _) => { + ("Clone", _, _) => { writeln!(w, "\t/// Called, if set, after this {} has been cloned into a duplicate object.", trait_name).unwrap(); writeln!(w, "\t/// The new {} is provided, and should be mutated as needed to perform a", trait_name).unwrap(); writeln!(w, "\t/// deep copy of the object pointed to by this_arg or avoid any double-freeing.").unwrap(); writeln!(w, "\tpub cloned: Option,", trait_name, trait_name).unwrap(); generated_fields.push(("cloned".to_owned(), None, None)); }, - ("std::cmp::Eq", _)|("core::cmp::Eq", _) => { + ("std::cmp::Eq", _, _)|("core::cmp::Eq", _, _) => { let eq_docs = "Checks if two objects are equal given this object's this_arg pointer and another object."; writeln!(w, "\t/// {}", eq_docs).unwrap(); writeln!(w, "\tpub eq: extern \"C\" fn (this_arg: *const c_void, other_arg: &{}) -> bool,", trait_name).unwrap(); generated_fields.push(("eq".to_owned(), None, Some(format!("\t/** {} */\n", eq_docs)))); }, - ("std::hash::Hash", _)|("core::hash::Hash", _) => { + ("std::hash::Hash", _, _)|("core::hash::Hash", _, _) => { let hash_docs_a = "Calculate a succinct non-cryptographic hash for an object given its this_arg pointer."; let hash_docs_b = "This is used, for example, for inclusion of this object in a hash map."; writeln!(w, "\t/// {}", hash_docs_a).unwrap(); @@ -407,15 +408,15 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty generated_fields.push(("hash".to_owned(), None, Some(format!("\t/**\n\t * {}\n\t * {}\n\t */\n", hash_docs_a, hash_docs_b)))); }, - ("Send", _) => {}, ("Sync", _) => {}, - ("std::fmt::Debug", _)|("core::fmt::Debug", _) => { + ("Send", _, _) => {}, ("Sync", _, _) => {}, + ("std::fmt::Debug", _, _)|("core::fmt::Debug", _, _) => { let debug_docs = "Return a human-readable \"debug\" string describing this object"; writeln!(w, "\t/// {}", debug_docs).unwrap(); writeln!(w, "\tpub debug_str: extern \"C\" fn (this_arg: *const c_void) -> crate::c_types::Str,").unwrap(); generated_fields.push(("debug_str".to_owned(), None, Some(format!("\t/**\n\t * {}\n\t */\n", debug_docs)))); }, - (s, i) => { + (s, i, _) => { // TODO: Both of the below should expose supertrait methods in C++, but doing so is // nontrivial. generated_fields.push(if types.crate_types.traits.get(s).is_none() { @@ -441,7 +442,9 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty writeln!(w, "}}").unwrap(); macro_rules! impl_trait_for_c { - ($t: expr, $impl_accessor: expr, $type_resolver: expr) => { + ($t: expr, $impl_accessor: expr, $type_resolver: expr, $generic_impls: expr) => { + let mut trait_gen_types = gen_types.push_ctx(); + assert!(trait_gen_types.learn_generics_with_impls(&$t.generics, $generic_impls, $type_resolver)); for item in $t.items.iter() { match item { syn::TraitItem::Method(m) => { @@ -450,7 +453,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty m.sig.abi.is_some() || m.sig.variadic.is_some() { panic!("1"); } - let mut meth_gen_types = gen_types.push_ctx(); + let mut meth_gen_types = trait_gen_types.push_ctx(); assert!(meth_gen_types.learn_generics(&m.sig.generics, $type_resolver)); // Note that we do *not* use the method generics when printing "native" // rust parts - if the method is generic, we need to print a generic @@ -565,17 +568,17 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty // Implement supertraits for the C-mapped struct. walk_supertraits!(t, Some(&types), ( - ("std::cmp::Eq", _)|("core::cmp::Eq", _) => { + ("std::cmp::Eq", _, _)|("core::cmp::Eq", _, _) => { writeln!(w, "impl core::cmp::Eq for {} {{}}", trait_name).unwrap(); writeln!(w, "impl core::cmp::PartialEq for {} {{", trait_name).unwrap(); writeln!(w, "\tfn eq(&self, o: &Self) -> bool {{ (self.eq)(self.this_arg, o) }}\n}}").unwrap(); }, - ("std::hash::Hash", _)|("core::hash::Hash", _) => { + ("std::hash::Hash", _, _)|("core::hash::Hash", _, _) => { writeln!(w, "impl core::hash::Hash for {} {{", trait_name).unwrap(); writeln!(w, "\tfn hash(&self, hasher: &mut H) {{ hasher.write_u64((self.hash)(self.this_arg)) }}\n}}").unwrap(); }, - ("Send", _) => {}, ("Sync", _) => {}, - ("Clone", _) => { + ("Send", _, _) => {}, ("Sync", _, _) => {}, + ("Clone", _, _) => { writeln!(w, "#[no_mangle]").unwrap(); writeln!(w, "/// Creates a copy of a {}", trait_name).unwrap(); writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{", trait_name, trait_name, trait_name).unwrap(); @@ -587,28 +590,41 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty writeln!(w, "\t\t{}_clone(self)", trait_name).unwrap(); writeln!(w, "\t}}\n}}").unwrap(); }, - ("std::fmt::Debug", _)|("core::fmt::Debug", _) => { + ("std::fmt::Debug", _, _)|("core::fmt::Debug", _, _) => { writeln!(w, "impl core::fmt::Debug for {} {{", trait_name).unwrap(); writeln!(w, "\tfn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {{").unwrap(); writeln!(w, "\t\tf.write_str((self.debug_str)(self.this_arg).into_str())").unwrap(); writeln!(w, "\t}}").unwrap(); writeln!(w, "}}").unwrap(); }, - (s, i) => { + (s, i, generic_args) => { if let Some(supertrait) = types.crate_types.traits.get(s) { let resolver = get_module_type_resolver!(s, types.crate_libs, types.crate_types); - - // Blindly assume that the same imports where `supertrait` is defined are also - // imported here. This will almost certainly break at some point, but it should be - // a compilation failure when it does so. - write!(w, "impl").unwrap(); - maybe_write_lifetime_generics(w, &supertrait.generics, types); - write!(w, " {}", s).unwrap(); - maybe_write_generics(w, &supertrait.generics, types, false); - writeln!(w, " for {} {{", trait_name).unwrap(); - - impl_trait_for_c!(supertrait, format!(".{}", i), &resolver); - writeln!(w, "}}").unwrap(); + macro_rules! impl_supertrait { + ($s: expr, $supertrait: expr, $i: expr, $generic_args: expr) => { + let resolver = get_module_type_resolver!($s, types.crate_libs, types.crate_types); + + // Blindly assume that the same imports where `supertrait` is defined are also + // imported here. This will almost certainly break at some point, but it should be + // a compilation failure when it does so. + write!(w, "impl").unwrap(); + maybe_write_lifetime_generics(w, &$supertrait.generics, types); + write!(w, " {}", $s).unwrap(); + maybe_write_generics(w, &$supertrait.generics, $generic_args, types, false); + writeln!(w, " for {} {{", trait_name).unwrap(); + + impl_trait_for_c!($supertrait, format!(".{}", $i), &resolver, $generic_args); + writeln!(w, "}}").unwrap(); + } + } + impl_supertrait!(s, supertrait, i, generic_args); + walk_supertraits!(supertrait, Some(&resolver), ( + (s, supertrait_i, generic_args) => { + if let Some(supertrait) = types.crate_types.traits.get(s) { + impl_supertrait!(s, supertrait, format!("{}.{}", i, supertrait_i), generic_args); + } + } + ) ); } else { do_write_impl_trait(w, s, i, &trait_name); } @@ -621,9 +637,9 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty write!(w, "impl").unwrap(); maybe_write_lifetime_generics(w, &t.generics, types); write!(w, " rust{}", t.ident).unwrap(); - maybe_write_generics(w, &t.generics, types, false); + maybe_write_generics(w, &t.generics, &syn::PathArguments::None, types, false); writeln!(w, " for {} {{", trait_name).unwrap(); - impl_trait_for_c!(t, "", types); + impl_trait_for_c!(t, "", types, &syn::PathArguments::None); writeln!(w, "}}\n").unwrap(); writeln!(w, "// We're essentially a pointer already, or at least a set of pointers, so allow us to be used").unwrap(); writeln!(w, "// directly as a Deref trait in higher-level structs:").unwrap(); @@ -652,7 +668,7 @@ fn writeln_opaque(w: &mut W, ident: &syn::Ident, struct_name: // https://github.com/eqrion/cbindgen/issues/286 Thus, instead, we import it as a temporary // name and then reference it by that name, which works around the issue. write!(w, "\nuse {}::{} as native{}Import;\npub(crate) type native{} = native{}Import", types.module_path, ident, ident, ident, ident).unwrap(); - maybe_write_generics(w, &generics, &types, true); + maybe_write_generics(w, &generics, &syn::PathArguments::None, &types, true); writeln!(w, ";\n").unwrap(); writeln!(extra_headers, "struct native{}Opaque;\ntypedef struct native{}Opaque LDKnative{};", ident, ident, ident).unwrap(); writeln_docs(w, &attrs, ""); @@ -674,7 +690,7 @@ fn writeln_opaque(w: &mut W, ident: &syn::Ident, struct_name: writeln!(w, "#[allow(unused)]").unwrap(); writeln!(w, "/// Used only if an object of this type is returned as a trait impl by a method").unwrap(); writeln!(w, "pub(crate) extern \"C\" fn {}_free_void(this_ptr: *mut c_void) {{", struct_name).unwrap(); - writeln!(w, "\tunsafe {{ let _ = Box::from_raw(this_ptr as *mut native{}); }}\n}}", struct_name).unwrap(); + writeln!(w, "\tlet _ = unsafe {{ Box::from_raw(this_ptr as *mut native{}) }};\n}}", struct_name).unwrap(); writeln!(w, "#[allow(unused)]").unwrap(); writeln!(w, "impl {} {{", struct_name).unwrap(); writeln!(w, "\tpub(crate) fn get_native_ref(&self) -> &'static native{} {{", struct_name).unwrap(); @@ -735,6 +751,25 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct, write!(w, "inner_val").unwrap(); types.write_to_c_conversion_inline_suffix(w, &ref_type, Some(&gen_types), true); writeln!(w, "\n}}").unwrap(); + } else { + // If the type isn't reference-able, but is clonable, export a getter that just clones + if types.understood_c_type(&$field.ty, Some(&gen_types)) { + let mut v = Vec::new(); + types.write_c_type(&mut v, &$field.ty, Some(&gen_types), true); + let s = String::from_utf8(v).unwrap(); + if types.is_clonable(&s) { + writeln_arg_docs(w, &$field.attrs, "", types, Some(&gen_types), vec![].drain(..), Some(&$field.ty)); + writeln!(w, "///\n/// Returns a copy of the field.").unwrap(); + write!(w, "#[no_mangle]\npub extern \"C\" fn {}_get_{}(this_ptr: &{}) -> {}", struct_name, $new_name, struct_name, s).unwrap(); + write!(w, " {{\n\tlet mut inner_val = this_ptr.get_native_mut_ref().{}.clone();\n\t", $real_name).unwrap(); + let local_var = types.write_to_c_conversion_new_var(w, &format_ident!("inner_val"), &$field.ty, Some(&gen_types), true); + if local_var { write!(w, "\n\t").unwrap(); } + types.write_to_c_conversion_inline_prefix(w, &$field.ty, Some(&gen_types), true); + write!(w, "inner_val").unwrap(); + types.write_to_c_conversion_inline_suffix(w, &$field.ty, Some(&gen_types), true); + writeln!(w, "\n}}").unwrap(); + } + } } } @@ -827,7 +862,8 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct, write!(w, "\t}}").unwrap(); }, syn::Fields::Unnamed(fields) => { - assert!(s.generics.lt_token.is_none()); + assert!(!s.generics.params.iter() + .any(|gen| if let syn::GenericParam::Lifetime(_) = gen { false } else { true })); writeln!(w, "{} (", types.maybe_resolve_ident(&s.ident).unwrap()).unwrap(); for (idx, field) in fields.unnamed.iter().enumerate() { write!(w, "\t\t").unwrap(); @@ -853,7 +889,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct, /// Trait struct containing a pointer to the passed struct's inner field and the wrapper functions. /// /// A few non-crate Traits are hard-coded including Default. -fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut TypeResolver) { +fn writeln_impl(w: &mut W, w_uses: &mut HashSet, i: &syn::ItemImpl, types: &mut TypeResolver) { match export_status(&i.attrs) { ExportStatus::Export => {}, ExportStatus::NoExport|ExportStatus::TestOnly => return, @@ -914,7 +950,7 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ let supertrait_name; let supertrait_resolver; walk_supertraits!(trait_obj, Some(&types), ( - (s, _i) => { + (s, _i, _) => { if let Some(supertrait) = types.crate_types.traits.get(s) { supertrait_name = s.to_string(); supertrait_resolver = get_module_type_resolver!(supertrait_name, types.crate_libs, types.crate_types); @@ -928,7 +964,7 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ // mappings from a trai defined in a different file, we may mis-resolve or // fail to resolve the mapped types. Thus, we have to construct a new // resolver for the module that the trait was defined in here first. - let trait_resolver = get_module_type_resolver!(full_trait_path, types.crate_libs, types.crate_types); + let mut trait_resolver = get_module_type_resolver!(full_trait_path, types.crate_libs, types.crate_types); gen_types.learn_associated_types(trait_obj, &trait_resolver); let mut impl_associated_types = HashMap::new(); for item in i.items.iter() { @@ -957,11 +993,11 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ // type-conversion logic without actually knowing the concrete native type. if !resolved_path.starts_with(types.module_path) { if !first_seg_is_stdlib(resolved_path.split("::").next().unwrap()) { - writeln!(w, "use crate::{}::native{} as native{};", resolved_path.rsplitn(2, "::").skip(1).next().unwrap(), ident, ident).unwrap(); - writeln!(w, "use crate::{};", resolved_path).unwrap(); - writeln!(w, "use crate::{}_free_void;", resolved_path).unwrap(); + w_uses.insert(format!("use crate::{}::native{} as native{};", resolved_path.rsplitn(2, "::").skip(1).next().unwrap(), ident, ident)); + w_uses.insert(format!("use crate::{};", resolved_path)); + w_uses.insert(format!("use crate::{}_free_void;", resolved_path)); } else { - writeln!(w, "use {} as native{};", resolved_path, ident).unwrap(); + w_uses.insert(format!("use {} as native{};", resolved_path, ident)); } } writeln!(w, "impl From for crate::{} {{", ident, full_trait_path).unwrap(); @@ -1029,26 +1065,47 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ } let mut requires_clone = false; walk_supertraits!(trait_obj, Some(&types), ( - ("Clone", _) => { + ("Clone", _, _) => { requires_clone = true; writeln!(w, "\t\tcloned: Some({}_{}_cloned),", trait_obj.ident, ident).unwrap(); }, - ("Sync", _) => {}, ("Send", _) => {}, - ("std::marker::Sync", _) => {}, ("std::marker::Send", _) => {}, - ("core::fmt::Debug", _) => {}, - (s, t) => { + ("Sync", _, _) => {}, ("Send", _, _) => {}, + ("std::marker::Sync", _, _) => {}, ("std::marker::Send", _, _) => {}, + ("core::fmt::Debug", _, _) => {}, + (s, t, _) => { if let Some(supertrait_obj) = types.crate_types.traits.get(s) { - writeln!(w, "\t\t{}: crate::{} {{", t, s).unwrap(); - writeln!(w, "\t\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},").unwrap(); - writeln!(w, "\t\t\tfree: None,").unwrap(); - for item in supertrait_obj.items.iter() { - match item { - syn::TraitItem::Method(m) => { - write_meth!(m, supertrait_obj, "\t"); + macro_rules! write_impl_fields { + ($s: expr, $supertrait_obj: expr, $t: expr, $pfx: expr, $resolver: expr) => { + writeln!(w, "{}\t{}: crate::{} {{", $pfx, $t, $s).unwrap(); + writeln!(w, "{}\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},", $pfx).unwrap(); + writeln!(w, "{}\t\tfree: None,", $pfx).unwrap(); + for item in $supertrait_obj.items.iter() { + match item { + syn::TraitItem::Method(m) => { + write_meth!(m, $supertrait_obj, $pfx); + }, + _ => {}, + } + } + walk_supertraits!($supertrait_obj, Some(&$resolver), ( + ("Clone", _, _) => { + writeln!(w, "{}\tcloned: Some({}_{}_cloned),", $pfx, $supertrait_obj.ident, ident).unwrap(); }, - _ => {}, + (_, _, _) => {} + ) ); } } + write_impl_fields!(s, supertrait_obj, t, "\t", types); + + let resolver = get_module_type_resolver!(s, types.crate_libs, types.crate_types); + walk_supertraits!(supertrait_obj, Some(&resolver), ( + (s, t, _) => { + if let Some(supertrait_obj) = types.crate_types.traits.get(s) { + write_impl_fields!(s, supertrait_obj, t, "\t\t", resolver); + write!(w, "\t\t\t}},\n").unwrap(); + } + } + ) ); write!(w, "\t\t}},\n").unwrap(); } else { write_trait_impl_field_assign(w, s, ident); @@ -1088,17 +1145,12 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ _ => {} } } - if uncallable_function { - let mut trait_resolver = get_module_type_resolver!(full_trait_path, $types.crate_libs, $types.crate_types); - write_method_params(w, &$trait_meth.sig, "c_void", &mut trait_resolver, Some(&meth_gen_types), true, true); - } else { - write_method_params(w, &$m.sig, "c_void", $types, Some(&meth_gen_types), true, true); - } + write_method_params(w, &$trait_meth.sig, "c_void", &mut trait_resolver, Some(&meth_gen_types), true, true); write!(w, " {{\n\t").unwrap(); if uncallable_function { write!(w, "unreachable!();").unwrap(); } else { - write_method_var_decl_body(w, &$m.sig, "", $types, Some(&meth_gen_types), false); + write_method_var_decl_body(w, &$trait_meth.sig, "", &mut trait_resolver, Some(&meth_gen_types), false); let mut takes_self = false; for inp in $m.sig.inputs.iter() { if let syn::FnArg::Receiver(_) = inp { @@ -1111,6 +1163,14 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ if idx != 0 { t_gen_args += ", " }; t_gen_args += "_" } + // rustc doesn't like <_> if the _ is actually a lifetime, so + // if all the parameters are lifetimes just skip it. + let mut nonlifetime_param = false; + for param in $trait.generics.params.iter() { + if let syn::GenericParam::Lifetime(_) = param {} + else { nonlifetime_param = true; } + } + if !nonlifetime_param { t_gen_args = String::new(); } if takes_self { write!(w, ">::{}(unsafe {{ &mut *(this_arg as *mut native{}) }}, ", ident, $trait_path, t_gen_args, $m.sig.ident, ident).unwrap(); } else { @@ -1128,7 +1188,7 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ }, _ => {}, } - write_method_call_params(w, &$m.sig, "", $types, Some(&meth_gen_types), &real_type, false); + write_method_call_params(w, &$trait_meth.sig, "", &mut trait_resolver, Some(&meth_gen_types), &real_type, false); } write!(w, "\n}}\n").unwrap(); if let syn::ReturnType::Type(_, rtype) = &$m.sig.output { @@ -1166,7 +1226,6 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ assert!(meth.default.is_some()); let old_gen_types = gen_types; gen_types = GenericTypes::new(Some(resolved_path.clone())); - let mut trait_resolver = get_module_type_resolver!(full_trait_path, types.crate_libs, types.crate_types); impl_meth!(meth, meth, full_trait_path, trait_obj, "", &mut trait_resolver); gen_types = old_gen_types; }, @@ -1178,7 +1237,7 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ writeln!(w, "\tnew_obj.this_arg = {}_clone_void(new_obj.this_arg);", ident).unwrap(); writeln!(w, "\tnew_obj.free = Some({}_free_void);", ident).unwrap(); walk_supertraits!(trait_obj, Some(&types), ( - (s, t) => { + (s, t, _) => { if types.crate_types.traits.get(s).is_some() { assert!(!types.is_clonable(s)); // We don't currently support cloning with a clonable supertrait writeln!(w, "\tnew_obj.{}.this_arg = new_obj.this_arg;", t).unwrap(); @@ -1335,6 +1394,7 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ ExportStatus::NoExport|ExportStatus::TestOnly => continue, ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"), } + if m.sig.asyncness.is_some() { continue; } let mut meth_gen_types = gen_types.push_ctx(); assert!(meth_gen_types.learn_generics(&m.sig.generics, types)); if m.defaultness.is_some() { unimplemented!(); } @@ -1383,7 +1443,7 @@ fn writeln_impl(w: &mut W, i: &syn::ItemImpl, types: &mut Typ } } } else if let Some(resolved_path) = types.maybe_resolve_ident(&ident) { - create_alias_for_impl(resolved_path, i, types, move |aliased_impl, types| writeln_impl(w, &aliased_impl, types)); + create_alias_for_impl(resolved_path, i, types, move |aliased_impl, types| writeln_impl(w, w_uses, &aliased_impl, types)); } else { eprintln!("Not implementing anything for {} due to no-resolve (probably the type isn't pub)", ident); } @@ -1406,7 +1466,7 @@ fn create_alias_for_impl(resolved_pa let alias_resolver_override; let alias_resolver = if alias_module != types.module_path { - alias_resolver_override = ImportResolver::new(types.types.crate_name, &types.crate_types.lib_ast.dependencies, + alias_resolver_override = ImportResolver::new(types.types.crate_name, &types.crate_types.lib_ast, alias_module, &types.crate_types.lib_ast.modules.get(alias_module).unwrap().items); &alias_resolver_override } else { &types.types }; @@ -1708,7 +1768,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type } writeln!(w, "}}\nuse {}::{} as {}Import;", types.module_path, e.ident, e.ident).unwrap(); write!(w, "pub(crate) type native{} = {}Import", e.ident, e.ident).unwrap(); - maybe_write_generics(w, &e.generics, &types, true); + maybe_write_generics(w, &e.generics, &syn::PathArguments::None, &types, true); writeln!(w, ";\n\nimpl {} {{", e.ident).unwrap(); macro_rules! write_conv { @@ -1755,7 +1815,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type }; if $ref || new_var { if $ref { - write!(w, "let mut {}_nonref = (*{}).clone();\n\t\t\t\t", $field_ident, $field_ident).unwrap(); + write!(w, "let mut {}_nonref = Clone::clone({});\n\t\t\t\t", $field_ident, $field_ident).unwrap(); if new_var { let nonref_ident = format_ident!("{}_nonref", $field_ident); if $to_c { @@ -1877,7 +1937,7 @@ fn writeln_fn<'a, 'b, W: std::io::Write>(w: &mut W, f: &'a syn::ItemFn, types: & write!(w, "{}::{}", types.module_path, f.sig.ident).unwrap(); let mut function_generic_args = Vec::new(); - maybe_write_generics(&mut function_generic_args, &f.sig.generics, types, true); + maybe_write_generics(&mut function_generic_args, &f.sig.generics, &syn::PathArguments::None, types, true); if !function_generic_args.is_empty() { write!(w, "::{}", String::from_utf8(function_generic_args).unwrap()).unwrap(); } @@ -1891,7 +1951,7 @@ fn writeln_fn<'a, 'b, W: std::io::Write>(w: &mut W, f: &'a syn::ItemFn, types: & // *** File/Crate Walking Logic *** // ******************************** -fn convert_priv_mod<'a, 'b: 'a, W: std::io::Write>(w: &mut W, libast: &'b FullLibraryAST, crate_types: &CrateTypes<'b>, out_dir: &str, mod_path: &str, module: &'b syn::ItemMod) { +fn convert_priv_mod<'a, 'b: 'a, W: std::io::Write>(w: &mut W, w_uses: &mut HashSet, libast: &'b FullLibraryAST, crate_types: &CrateTypes<'b>, out_dir: &str, mod_path: &str, module: &'b syn::ItemMod) { // We want to ignore all items declared in this module (as they are not pub), but we still need // to give the ImportResolver any use statements, so we copy them here. let mut use_items = Vec::new(); @@ -1900,15 +1960,15 @@ fn convert_priv_mod<'a, 'b: 'a, W: std::io::Write>(w: &mut W, libast: &'b FullLi use_items.push(item); } } - let import_resolver = ImportResolver::from_borrowed_items(mod_path.splitn(2, "::").next().unwrap(), &libast.dependencies, mod_path, &use_items); + let import_resolver = ImportResolver::from_borrowed_items(mod_path.splitn(2, "::").next().unwrap(), libast, mod_path, &use_items); let mut types = TypeResolver::new(mod_path, import_resolver, crate_types); writeln!(w, "mod {} {{\n{}", module.ident, DEFAULT_IMPORTS).unwrap(); for item in module.content.as_ref().unwrap().1.iter() { match item { - syn::Item::Mod(m) => convert_priv_mod(w, libast, crate_types, out_dir, &format!("{}::{}", mod_path, module.ident), m), + syn::Item::Mod(m) => convert_priv_mod(w, w_uses, libast, crate_types, out_dir, &format!("{}::{}", mod_path, module.ident), m), syn::Item::Impl(i) => { - writeln_impl(w, i, &mut types); + writeln_impl(w, w_uses, i, &mut types); }, _ => {}, } @@ -1935,6 +1995,7 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a> let _ = std::fs::create_dir((&new_file_path.as_ref() as &std::path::Path).parent().unwrap()); let mut out = std::fs::OpenOptions::new().write(true).create(true).truncate(true) .open(new_file_path).expect("Unable to open new src file"); + let mut out_uses = HashSet::default(); writeln!(out, "// This file is Copyright its original authors, visible in version control").unwrap(); writeln!(out, "// history and in the source files from which this was generated.").unwrap(); @@ -1981,7 +2042,7 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a> eprintln!("Converting {} entries...", module); - let import_resolver = ImportResolver::new(orig_crate, &libast.dependencies, module, items); + let import_resolver = ImportResolver::new(orig_crate, libast, module, items); let mut type_resolver = TypeResolver::new(module, import_resolver, crate_types); for item in items.iter() { @@ -1994,7 +2055,7 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a> } }, syn::Item::Impl(i) => { - writeln_impl(&mut out, &i, &mut type_resolver); + writeln_impl(&mut out, &mut out_uses, &i, &mut type_resolver); }, syn::Item::Struct(s) => { if let syn::Visibility::Public(_) = s.vis { @@ -2007,7 +2068,7 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a> } }, syn::Item::Mod(m) => { - convert_priv_mod(&mut out, libast, crate_types, out_dir, &format!("{}::{}", module, m.ident), m); + convert_priv_mod(&mut out, &mut out_uses, libast, crate_types, out_dir, &format!("{}::{}", module, m.ident), m); }, syn::Item::Const(c) => { // Re-export any primitive-type constants. @@ -2077,6 +2138,10 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a> } } + for use_stmt in out_uses { + writeln!(out, "{}", use_stmt).unwrap(); + } + out.flush().unwrap(); } } @@ -2089,7 +2154,7 @@ fn walk_ast_second_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &Crate let ASTModule { ref attrs, ref items, .. } = astmod; assert_eq!(export_status(&attrs), ExportStatus::Export); - let import_resolver = ImportResolver::new(orig_crate, &ast_storage.dependencies, module, items); + let import_resolver = ImportResolver::new(orig_crate, ast_storage, module, items); let mut types = TypeResolver::new(module, import_resolver, crate_types); for item in items.iter() { @@ -2125,7 +2190,7 @@ fn walk_ast_second_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &Crate } fn walk_private_mod<'a>(ast_storage: &'a FullLibraryAST, orig_crate: &str, module: String, items: &'a syn::ItemMod, crate_types: &mut CrateTypes<'a>) { - let import_resolver = ImportResolver::new(orig_crate, &ast_storage.dependencies, &module, &items.content.as_ref().unwrap().1); + let import_resolver = ImportResolver::new(orig_crate, ast_storage, &module, &items.content.as_ref().unwrap().1); for item in items.content.as_ref().unwrap().1.iter() { match item { syn::Item::Mod(m) => walk_private_mod(ast_storage, orig_crate, format!("{}::{}", module, m.ident), m, crate_types), @@ -2154,7 +2219,7 @@ fn walk_ast_first_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut Cr let ASTModule { ref attrs, ref items, submods: _ } = astmod; assert_eq!(export_status(&attrs), ExportStatus::Export); let orig_crate = module.splitn(2, "::").next().unwrap(); - let import_resolver = ImportResolver::new(orig_crate, &ast_storage.dependencies, module, items); + let import_resolver = ImportResolver::new(orig_crate, ast_storage, module, items); for item in items.iter() { match item { @@ -2180,10 +2245,10 @@ fn walk_ast_first_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut Cr } let trait_path = format!("{}::{}", module, t.ident); walk_supertraits!(t, None, ( - ("Clone", _) => { + ("Clone", _, _) => { crate_types.set_clonable("crate::".to_owned() + &trait_path); }, - (_, _) => {} + (_, _, _) => {} ) ); crate_types.traits.insert(trait_path, &t); }