projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
578f8b7
)
[bindings] Avoid double-use'ing traits by writing out the path
author
Matt Corallo
<git@bluematt.me>
Mon, 1 Mar 2021 22:06:25 +0000
(17:06 -0500)
committer
Matt Corallo
<git@bluematt.me>
Sun, 7 Mar 2021 18:06:07 +0000
(13:06 -0500)
c-bindings-gen/src/main.rs
patch
|
blob
|
history
diff --git
a/c-bindings-gen/src/main.rs
b/c-bindings-gen/src/main.rs
index 5b99cd681819df8ad6643272224cc97d57e8bc17..f2f684fd64e985179af6ec5839374caa6f2da142 100644
(file)
--- a/
c-bindings-gen/src/main.rs
+++ b/
c-bindings-gen/src/main.rs
@@
-808,10
+808,10
@@
fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
}
}
) );
}
}
) );
- write
!(w, "\t}}\n}}\nuse {}::{} as {}TraitImport;\n", types.orig_crate, full_trait_path, trait_obj.ident
).unwrap();
+ write
ln!(w, "\t}}\n}}\n"
).unwrap();
macro_rules! impl_meth {
macro_rules! impl_meth {
- ($m: expr, $trait: expr, $indent: expr) => {
+ ($m: expr, $trait
_path: expr, $trait
: expr, $indent: expr) => {
let trait_method = $trait.items.iter().filter_map(|item| {
if let syn::TraitItem::Method(t_m) = item { Some(t_m) } else { None }
}).find(|trait_meth| trait_meth.sig.ident == $m.sig.ident).unwrap();
let trait_method = $trait.items.iter().filter_map(|item| {
if let syn::TraitItem::Method(t_m) = item { Some(t_m) } else { None }
}).find(|trait_meth| trait_meth.sig.ident == $m.sig.ident).unwrap();
@@
-842,9
+842,9
@@
fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
t_gen_args += "_"
}
if takes_self {
t_gen_args += "_"
}
if takes_self {
- write!(w, "<native{} as {}
TraitImport<{}>>::{}(unsafe {{ &mut *(this_arg as *mut native{}) }}, ", ident, $trait.ident
, t_gen_args, $m.sig.ident, ident).unwrap();
+ write!(w, "<native{} as {}
::{}<{}>>::{}(unsafe {{ &mut *(this_arg as *mut native{}) }}, ", ident, types.orig_crate, $trait_path
, t_gen_args, $m.sig.ident, ident).unwrap();
} else {
} else {
- write!(w, "<native{} as {}
TraitImport<{}>>::{}(", ident, $trait.ident
, t_gen_args, $m.sig.ident).unwrap();
+ write!(w, "<native{} as {}
::{}<{}>>::{}(", ident, types.orig_crate, $trait_path
, t_gen_args, $m.sig.ident).unwrap();
}
let mut real_type = "".to_string();
}
let mut real_type = "".to_string();
@@
-881,20
+881,19
@@
fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
for item in i.items.iter() {
match item {
syn::ImplItem::Method(m) => {
for item in i.items.iter() {
match item {
syn::ImplItem::Method(m) => {
- impl_meth!(m, trait_obj, "");
+ impl_meth!(m,
full_trait_path,
trait_obj, "");
},
syn::ImplItem::Type(_) => {},
_ => unimplemented!(),
}
}
walk_supertraits!(trait_obj, Some(&types), (
},
syn::ImplItem::Type(_) => {},
_ => unimplemented!(),
}
}
walk_supertraits!(trait_obj, Some(&types), (
- (s,
t
) => {
+ (s,
_
) => {
if let Some(supertrait_obj) = types.crate_types.traits.get(s).cloned() {
if let Some(supertrait_obj) = types.crate_types.traits.get(s).cloned() {
- writeln!(w, "use {}::{} as native{}Trait;", types.orig_crate, s, t).unwrap();
for item in supertrait_obj.items.iter() {
match item {
syn::TraitItem::Method(m) => {
for item in supertrait_obj.items.iter() {
match item {
syn::TraitItem::Method(m) => {
- impl_meth!(m, supertrait_obj, "\t");
+ impl_meth!(m, s
, s
upertrait_obj, "\t");
},
_ => {},
}
},
_ => {},
}