self_ty: Option<String>,
parent: Option<&'b GenericTypes<'b, 'b>>,
typed_generics: HashMap<&'a syn::Ident, String>,
- default_generics: HashMap<&'a syn::Ident, (syn::Type, syn::Type)>,
+ default_generics: HashMap<&'a syn::Ident, (syn::Type, syn::Type, syn::Type)>,
}
impl<'a, 'p: 'a> GenericTypes<'a, 'p> {
pub fn new(self_ty: Option<String>) -> Self {
if non_lifetimes_processed { return false; }
non_lifetimes_processed = true;
if path != "std::ops::Deref" && path != "core::ops::Deref" {
+ let p = string_path_to_syn_path(&path);
+ let ref_ty = parse_quote!(&#p);
+ let mut_ref_ty = parse_quote!(&mut #p);
+ self.default_generics.insert(&type_param.ident, (syn::Type::Path(syn::TypePath { qself: None, path: p }), ref_ty, mut_ref_ty));
new_typed_generics.insert(&type_param.ident, Some(path));
- } else if trait_bound.path.segments.len() == 1 {
+ } else {
// If we're templated on Deref<Target = ConcreteThing>, store
// the reference type in `default_generics` which handles full
// types and not just paths.
if let syn::PathArguments::AngleBracketed(ref args) =
trait_bound.path.segments[0].arguments {
+ assert_eq!(trait_bound.path.segments.len(), 1);
for subargument in args.args.iter() {
match subargument {
syn::GenericArgument::Lifetime(_) => {},
syn::GenericArgument::Binding(ref b) => {
if &format!("{}", b.ident) != "Target" { return false; }
let default = &b.ty;
- self.default_generics.insert(&type_param.ident, (parse_quote!(&#default), parse_quote!(&#default)));
+ self.default_generics.insert(&type_param.ident, (parse_quote!(&#default), parse_quote!(&#default), parse_quote!(&mut #default)));
break 'bound_loop;
},
_ => unimplemented!(),
}
if let Some(default) = type_param.default.as_ref() {
assert!(type_param.bounds.is_empty());
- self.default_generics.insert(&type_param.ident, (default.clone(), parse_quote!(&#default)));
+ self.default_generics.insert(&type_param.ident, (default.clone(), parse_quote!(&#default), parse_quote!(&mut #default)));
}
},
_ => {},
if p.qself.is_some() { return false; }
if p.path.leading_colon.is_some() { return false; }
let mut p_iter = p.path.segments.iter();
- if let Some(gen) = new_typed_generics.get_mut(&p_iter.next().unwrap().ident) {
+ let p_ident = &p_iter.next().unwrap().ident;
+ if let Some(gen) = new_typed_generics.get_mut(p_ident) {
if gen.is_some() { return false; }
if &format!("{}", p_iter.next().unwrap().ident) != "Target" {return false; }
if non_lifetimes_processed { return false; }
non_lifetimes_processed = true;
assert_simple_bound(&trait_bound);
- *gen = Some(types.resolve_path(&trait_bound.path, None));
+ let resolved = types.resolve_path(&trait_bound.path, None);
+ let ty = syn::Type::Path(syn::TypePath {
+ qself: None, path: string_path_to_syn_path(&resolved)
+ });
+ let ref_ty = parse_quote!(&#ty);
+ let mut_ref_ty = parse_quote!(&mut #ty);
+ if types.crate_types.traits.get(&resolved).is_some() {
+ self.default_generics.insert(p_ident, (ty, ref_ty, mut_ref_ty));
+ } else {
+ self.default_generics.insert(p_ident, (ref_ty.clone(), ref_ty, mut_ref_ty));
+ }
+
+ *gen = Some(resolved);
}
}
} else { return false; }
match ty {
syn::Type::Path(p) => {
if let Some(ident) = p.path.get_ident() {
- if let Some((ty, _)) = us.default_generics.get(ident) {
- return ty;
+ if let Some((ty, _, _)) = us.default_generics.get(ident) {
+ return self.resolve_type(ty);
}
}
},
- syn::Type::Reference(syn::TypeReference { elem, .. }) => {
+ syn::Type::Reference(syn::TypeReference { elem, mutability, .. }) => {
if let syn::Type::Path(p) = &**elem {
if let Some(ident) = p.path.get_ident() {
- if let Some((_, refty)) = us.default_generics.get(ident) {
- return refty;
+ if let Some((_, refty, mut_ref_ty)) = us.default_generics.get(ident) {
+ if mutability.is_some() {
+ return self.resolve_type(mut_ref_ty);
+ } else {
+ return self.resolve_type(refty);
+ }
}
}
}
new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix);
let crate_name_ident = format_ident!("{}", crate_name);
path.push(parse_quote!(#crate_name_ident));
+ } else if format!("{}", $ident) == "self" {
+ let mut path_iter = partial_path.rsplitn(2, "::");
+ path_iter.next().unwrap();
+ new_path = path_iter.next().unwrap().to_owned();
} else {
new_path = format!("{}{}{}", partial_path, $ident, $path_suffix);
}
},
syn::UseTree::Name(n) => {
push_path!(n.ident, "");
- imports.insert(n.ident.clone(), (new_path, syn::Path { leading_colon: Some(syn::Token![::](Span::call_site())), segments: path }));
+ let imported_ident = syn::Ident::new(new_path.rsplitn(2, "::").next().unwrap(), Span::call_site());
+ imports.insert(imported_ident, (new_path, syn::Path { leading_colon: Some(syn::Token![::](Span::call_site())), segments: path }));
},
syn::UseTree::Group(g) => {
for i in g.items.iter() {
fn initial_clonable_types() -> HashSet<String> {
let mut res = HashSet::new();
res.insert("crate::c_types::u5".to_owned());
+ res.insert("crate::c_types::FourBytes".to_owned());
+ res.insert("crate::c_types::TwelveBytes".to_owned());
+ res.insert("crate::c_types::SixteenBytes".to_owned());
+ res.insert("crate::c_types::TwentyBytes".to_owned());
res.insert("crate::c_types::ThirtyTwoBytes".to_owned());
res.insert("crate::c_types::SecretKey".to_owned());
res.insert("crate::c_types::PublicKey".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::Bech32Error".to_owned());
res.insert("crate::c_types::Secp256k1Error".to_owned());
res.insert("crate::c_types::IOError".to_owned());
+ res.insert("crate::c_types::Error".to_owned());
+ res.insert("crate::c_types::Str".to_owned());
+
+ // Because some types are manually-mapped to CVec_u8Z we may end up checking if its clonable
+ // before we ever get to constructing the type fully via
+ // `write_c_mangled_container_path_intern` (which will add it here too), so we have to manually
+ // add it on startup.
+ res.insert("crate::c_types::derived::CVec_u8Z".to_owned());
res
}
if let syn::Lit::Int(i) = &l.lit {
if i.base10_digits().parse::<usize>().unwrap() >= 32 {
let mut buf = Vec::new();
- self.write_rust_type(&mut buf, generics, &a.elem);
+ self.write_rust_type(&mut buf, generics, &a.elem, false);
let ty = String::from_utf8(buf).unwrap();
ty == "u8"
} else {
if let Some(t) = single_contained {
match t {
- syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_) => {
+ syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_)|syn::Type::Array(_) => {
let mut v = Vec::new();
let ret_ref = self.write_empty_rust_val_check_suffix(generics, &mut v, t);
let s = String::from_utf8(v).unwrap();
}
}
- fn write_rust_path<W: std::io::Write>(&self, w: &mut W, generics_resolver: Option<&GenericTypes>, path: &syn::Path) {
+ fn write_rust_path<W: std::io::Write>(&self, w: &mut W, generics_resolver: Option<&GenericTypes>, path: &syn::Path, with_ref_lifetime: bool, generated_crate_ref: bool) {
if let Some(resolved) = self.maybe_resolve_path(&path, generics_resolver) {
if self.is_primitive(&resolved) {
write!(w, "{}", path.get_ident().unwrap()).unwrap();
// checking for "bitcoin" explicitly.
if resolved.starts_with("bitcoin::") || Self::in_rust_prelude(&resolved) {
write!(w, "{}", resolved).unwrap();
- // If we're printing a generic argument, it needs to reference the crate, otherwise
- // the original crate:
- } else if self.maybe_resolve_path(&path, None).as_ref() == Some(&resolved) {
+ } else if !generated_crate_ref {
+ // If we're printing a generic argument, it needs to reference the crate, otherwise
+ // the original crate.
write!(w, "{}", self.real_rust_type_mapping(&resolved)).unwrap();
} else {
write!(w, "crate::{}", resolved).unwrap();
}
}
if let syn::PathArguments::AngleBracketed(args) = &path.segments.iter().last().unwrap().arguments {
- self.write_rust_generic_arg(w, generics_resolver, args.args.iter());
+ self.write_rust_generic_arg(w, generics_resolver, args.args.iter(), with_ref_lifetime);
}
} else {
if path.leading_colon.is_some() {
if idx != 0 { write!(w, "::").unwrap(); }
write!(w, "{}", seg.ident).unwrap();
if let syn::PathArguments::AngleBracketed(args) = &seg.arguments {
- self.write_rust_generic_arg(w, generics_resolver, args.args.iter());
+ self.write_rust_generic_arg(w, generics_resolver, args.args.iter(), with_ref_lifetime);
}
}
}
match bound {
syn::TypeParamBound::Trait(tb) => {
if tb.paren_token.is_some() || tb.lifetimes.is_some() { unimplemented!(); }
- self.write_rust_path(w, generics_resolver, &tb.path);
+ self.write_rust_path(w, generics_resolver, &tb.path, false, false);
},
_ => unimplemented!(),
}
if had_params { write!(w, ">").unwrap(); }
}
- pub fn write_rust_generic_arg<'b, W: std::io::Write>(&self, w: &mut W, generics_resolver: Option<&GenericTypes>, generics: impl Iterator<Item=&'b syn::GenericArgument>) {
+ pub fn write_rust_generic_arg<'b, W: std::io::Write>(&self, w: &mut W, generics_resolver: Option<&GenericTypes>, generics: impl Iterator<Item=&'b syn::GenericArgument>, with_ref_lifetime: bool) {
write!(w, "<").unwrap();
for (idx, arg) in generics.enumerate() {
if idx != 0 { write!(w, ", ").unwrap(); }
match arg {
- syn::GenericArgument::Type(t) => self.write_rust_type(w, generics_resolver, t),
+ syn::GenericArgument::Type(t) => self.write_rust_type(w, generics_resolver, t, with_ref_lifetime),
_ => unimplemented!(),
}
}
write!(w, ">").unwrap();
}
- pub fn write_rust_type<W: std::io::Write>(&self, w: &mut W, generics: Option<&GenericTypes>, t: &syn::Type) {
- match generics.resolve_type(t) {
+ fn do_write_rust_type<W: std::io::Write>(&self, w: &mut W, generics: Option<&GenericTypes>, t: &syn::Type, with_ref_lifetime: bool, force_crate_ref: bool) {
+ let real_ty = generics.resolve_type(t);
+ let mut generate_crate_ref = force_crate_ref || t != real_ty;
+ match real_ty {
syn::Type::Path(p) => {
if p.qself.is_some() {
unimplemented!();
}
- self.write_rust_path(w, generics, &p.path);
+ if let Some(resolved_ty) = self.maybe_resolve_path(&p.path, generics) {
+ generate_crate_ref |= self.maybe_resolve_path(&p.path, None).as_ref() != Some(&resolved_ty);
+ if self.crate_types.traits.get(&resolved_ty).is_none() { generate_crate_ref = false; }
+ }
+ self.write_rust_path(w, generics, &p.path, with_ref_lifetime, generate_crate_ref);
},
syn::Type::Reference(r) => {
write!(w, "&").unwrap();
if let Some(lft) = &r.lifetime {
write!(w, "'{} ", lft.ident).unwrap();
+ } else if with_ref_lifetime {
+ write!(w, "'static ").unwrap();
}
if r.mutability.is_some() {
write!(w, "mut ").unwrap();
}
- self.write_rust_type(w, generics, &*r.elem);
+ self.do_write_rust_type(w, generics, &*r.elem, with_ref_lifetime, generate_crate_ref);
},
syn::Type::Array(a) => {
write!(w, "[").unwrap();
- self.write_rust_type(w, generics, &a.elem);
+ self.do_write_rust_type(w, generics, &a.elem, with_ref_lifetime, generate_crate_ref);
if let syn::Expr::Lit(l) = &a.len {
if let syn::Lit::Int(i) = &l.lit {
write!(w, "; {}]", i).unwrap();
}
syn::Type::Slice(s) => {
write!(w, "[").unwrap();
- self.write_rust_type(w, generics, &s.elem);
+ self.do_write_rust_type(w, generics, &s.elem, with_ref_lifetime, generate_crate_ref);
write!(w, "]").unwrap();
},
syn::Type::Tuple(s) => {
write!(w, "(").unwrap();
for (idx, t) in s.elems.iter().enumerate() {
if idx != 0 { write!(w, ", ").unwrap(); }
- self.write_rust_type(w, generics, &t);
+ self.do_write_rust_type(w, generics, &t, with_ref_lifetime, generate_crate_ref);
}
write!(w, ")").unwrap();
},
_ => unimplemented!(),
}
}
+ pub fn write_rust_type<W: std::io::Write>(&self, w: &mut W, generics: Option<&GenericTypes>, t: &syn::Type, with_ref_lifetime: bool) {
+ self.do_write_rust_type(w, generics, t, with_ref_lifetime, false);
+ }
+
/// Prints a constructor for something which is "uninitialized" (but obviously not actually
/// unint'd memory).
syn::Type::Path(p) => {
let resolved = self.resolve_path(&p.path, generics);
if let Some(arr_ty) = self.is_real_type_array(&resolved) {
- write!(w, ".data").unwrap();
return self.write_empty_rust_val_check_suffix(generics, w, &arr_ty);
}
if self.crate_types.opaques.get(&resolved).is_some() {
syn::Type::Array(a) => {
if let syn::Expr::Lit(l) = &a.len {
if let syn::Lit::Int(i) = &l.lit {
- write!(w, " == [0; {}]", i.base10_digits()).unwrap();
+ write!(w, ".data == [0; {}]", i.base10_digits()).unwrap();
EmptyValExpectedTy::NonPointer
} else { unimplemented!(); }
} else { unimplemented!(); }
// lifetime, of which the only real available choice is `static`, obviously.
write!(w, "&'static {}", crate_pfx).unwrap();
if !c_ty {
- self.write_rust_path(w, generics, path);
+ self.write_rust_path(w, generics, path, with_ref_lifetime, false);
} else {
// We shouldn't be mapping references in types, so panic here
unimplemented!();