use crate::blocks::*;
use proc_macro2::{TokenTree, Span};
+use quote::format_ident;
+use syn::parse_quote;
// The following utils are used purely to build our known types maps - they break down all the
// types we need to resolve to include the given object, and no more.
($ident: expr, $path_suffix: expr) => {
if partial_path == "" && !dependencies.contains(&$ident) {
new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix);
- path.push(syn::PathSegment { ident: syn::Ident::new(crate_name, Span::call_site()), 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 {
}
fn insert_primitive(imports: &mut HashMap<syn::Ident, (String, syn::Path)>, id: &str) {
- let ident = syn::Ident::new(id, Span::call_site());
- 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 ident = format_ident!("{}", id);
+ 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 {
let remaining: String = seg_iter.map(|seg| {
format!("::{}", seg.ident)
}).collect();
- if let Some((imp, _)) = self.imports.get(&first_seg.ident) {
+ let first_seg_str = format!("{}", first_seg.ident);
+ if first_seg_str == "std" {
+ Some(first_seg_str + &remaining)
+ } else if let Some((imp, _)) = self.imports.get(&first_seg.ident) {
if remaining != "" {
Some(imp.clone() + &remaining)
} else {
"String" if is_ref => Some("crate::c_types::Str"),
"std::time::Duration" => Some("u64"),
+ "std::io::Error" => Some("crate::c_types::IOError"),
- "bitcoin::secp256k1::key::PublicKey" => Some("crate::c_types::PublicKey"),
+ "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+ => Some("crate::c_types::PublicKey"),
"bitcoin::secp256k1::Signature" => Some("crate::c_types::Signature"),
- "bitcoin::secp256k1::key::SecretKey" if is_ref => Some("*const [u8; 32]"),
- "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some("crate::c_types::SecretKey"),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if is_ref => Some("*const [u8; 32]"),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if !is_ref => Some("crate::c_types::SecretKey"),
"bitcoin::secp256k1::Error" if !is_ref => Some("crate::c_types::Secp256k1Error"),
"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"),
"std::time::Duration" => Some("std::time::Duration::from_secs("),
- "bitcoin::secp256k1::key::PublicKey" if is_ref => Some("&"),
- "bitcoin::secp256k1::key::PublicKey" => Some(""),
+ "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+ if is_ref => Some("&"),
+ "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+ => Some(""),
"bitcoin::secp256k1::Signature" if is_ref => Some("&"),
"bitcoin::secp256k1::Signature" => Some(""),
- "bitcoin::secp256k1::key::SecretKey" if is_ref => Some("&::bitcoin::secp256k1::key::SecretKey::from_slice(&unsafe { *"),
- "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some(""),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if is_ref => Some("&::bitcoin::secp256k1::key::SecretKey::from_slice(&unsafe { *"),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if !is_ref => Some(""),
"bitcoin::blockdata::script::Script" if is_ref => Some("&::bitcoin::blockdata::script::Script::from(Vec::from("),
"bitcoin::blockdata::script::Script" if !is_ref => Some("::bitcoin::blockdata::script::Script::from("),
"bitcoin::blockdata::transaction::Transaction" if is_ref => Some("&"),
"std::time::Duration" => Some(")"),
- "bitcoin::secp256k1::key::PublicKey" => Some(".into_rust()"),
+ "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+ => Some(".into_rust()"),
"bitcoin::secp256k1::Signature" => Some(".into_rust()"),
- "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some(".into_rust()"),
- "bitcoin::secp256k1::key::SecretKey" if is_ref => Some("}[..]).unwrap()"),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if !is_ref => Some(".into_rust()"),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if is_ref => Some("}[..]).unwrap()"),
"bitcoin::blockdata::script::Script" if is_ref => Some(".to_slice()))"),
"bitcoin::blockdata::script::Script" if !is_ref => Some(".into_rust())"),
"bitcoin::blockdata::transaction::Transaction" => Some(".into_bitcoin()"),
"String" => Some(""),
"std::time::Duration" => Some(""),
+ "std::io::Error" if !is_ref => Some("crate::c_types::IOError::from_rust("),
- "bitcoin::secp256k1::key::PublicKey" => Some("crate::c_types::PublicKey::from_rust(&"),
+ "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+ => Some("crate::c_types::PublicKey::from_rust(&"),
"bitcoin::secp256k1::Signature" => Some("crate::c_types::Signature::from_rust(&"),
- "bitcoin::secp256k1::key::SecretKey" if is_ref => Some(""),
- "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some("crate::c_types::SecretKey::from_rust("),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if is_ref => Some(""),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if !is_ref => Some("crate::c_types::SecretKey::from_rust("),
"bitcoin::secp256k1::Error" if !is_ref => Some("crate::c_types::Secp256k1Error::from_rust("),
"bitcoin::blockdata::script::Script" if is_ref => Some("crate::c_types::u8slice::from_slice(&"),
"bitcoin::blockdata::script::Script" if !is_ref => Some(""),
"String" if is_ref => Some(".as_str().into()"),
"std::time::Duration" => Some(".as_secs()"),
+ "std::io::Error" if !is_ref => Some(")"),
- "bitcoin::secp256k1::key::PublicKey" => Some(")"),
+ "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+ => Some(")"),
"bitcoin::secp256k1::Signature" => Some(")"),
- "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some(")"),
- "bitcoin::secp256k1::key::SecretKey" if is_ref => Some(".as_ref()"),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if !is_ref => Some(")"),
+ "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+ if is_ref => Some(".as_ref()"),
"bitcoin::secp256k1::Error" if !is_ref => Some(")"),
"bitcoin::blockdata::script::Script" if is_ref => Some("[..])"),
"bitcoin::blockdata::script::Script" if !is_ref => Some(".into_bytes().into()"),
let tail_str = split.next().unwrap();
assert!(split.next().is_none());
let len = &tail_str[..tail_str.len() - 1];
- Some(syn::Type::Array(syn::TypeArray {
- bracket_token: syn::token::Bracket { span: Span::call_site() },
- elem: Box::new(syn::Type::Path(syn::TypePath {
- qself: None,
- path: syn::Path::from(syn::PathSegment::from(syn::Ident::new("u8", Span::call_site()))),
- })),
- semi_token: syn::Token!(;)(Span::call_site()),
- len: syn::Expr::Lit(syn::ExprLit { attrs: Vec::new(), lit: syn::Lit::Int(syn::LitInt::new(len, Span::call_site())) }),
- }))
+ Some(parse_quote!([u8; #len]))
} else { None }
} else { None }
}
write!(w, "{} {{ ", pfx).unwrap();
let new_var_name = format!("{}_{}", ident, idx);
- let new_var = self.write_conversion_new_var_intern(w, &syn::Ident::new(&new_var_name, Span::call_site()),
+ let new_var = self.write_conversion_new_var_intern(w, &format_ident!("{}", new_var_name),
&var_access, conv_ty, generics, contains_slice || (is_ref && ty_has_inner), ptr_for_ref, to_c, path_lookup, container_lookup, var_prefix, var_suffix);
if new_var { write!(w, " ").unwrap(); }
for (idx, elem) in t.elems.iter().enumerate() {
if let syn::Type::Path(p) = elem {
let v_name = format!("orig_{}_{}", ident, idx);
- let tuple_elem_ident = syn::Ident::new(&v_name, Span::call_site());
+ let tuple_elem_ident = format_ident!("{}", &v_name);
if self.write_conversion_new_var_intern(w, &tuple_elem_ident, &v_name, elem, generics,
false, ptr_for_ref, to_c,
path_lookup, container_lookup, var_prefix, var_suffix) {
self.check_create_container(mangled_container, "Vec", vec![&*r.elem], generics, false)
} else { false }
} else if let syn::Type::Tuple(_) = &*s.elem {
- let mut args = syn::punctuated::Punctuated::new();
+ let mut args = syn::punctuated::Punctuated::<_, syn::token::Comma>::new();
args.push(syn::GenericArgument::Type((*s.elem).clone()));
let mut segments = syn::punctuated::Punctuated::new();
- segments.push(syn::PathSegment {
- ident: syn::Ident::new("Vec", Span::call_site()),
- arguments: syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
- colon2_token: None, lt_token: syn::Token), args, gt_token: syn::Token),
- })
- });
+ segments.push(parse_quote!(Vec<#args>));
self.write_c_type_intern(w, &syn::Type::Path(syn::TypePath { qself: None, path: syn::Path { leading_colon: None, segments } }), generics, false, is_mut, ptr_for_ref)
} else { false }
},
projects / ldk-c-bindings / blobdiff