From 10c45786abb10b8d108655a6fb4bc758491dc1ef Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 25 Oct 2020 22:49:05 -0400 Subject: [PATCH] [bindings] Drop some significantly-overly-verbose logging in gen --- c-bindings-gen/src/main.rs | 3 +-- c-bindings-gen/src/types.rs | 30 ++++++------------------------ 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs index 97fc9b87..02521503 100644 --- a/c-bindings-gen/src/main.rs +++ b/c-bindings-gen/src/main.rs @@ -588,7 +588,7 @@ fn declare_struct<'a, 'b>(s: &'a syn::ItemStruct, types: &mut TypeResolver<'b, ' } } - types.struct_imported(&s.ident, format!("{}", s.ident)); + types.struct_imported(&s.ident); true } @@ -601,7 +601,6 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct, let struct_name = &format!("{}", s.ident); writeln_opaque(w, &s.ident, struct_name, &s.generics, &s.attrs, types, extra_headers, cpp_headers); - eprintln!("exporting fields for {}", struct_name); if let syn::Fields::Named(fields) = &s.fields { let mut gen_types = GenericTypes::new(); assert!(gen_types.learn_generics(&s.generics, types)); diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs index 0cf809c3..75995b84 100644 --- a/c-bindings-gen/src/types.rs +++ b/c-bindings-gen/src/types.rs @@ -466,10 +466,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "ln::features::InitFeatures" if is_ref && ptr_for_ref => Some("crate::ln::features::InitFeatures"), "ln::features::InitFeatures" if is_ref => Some("*const crate::ln::features::InitFeatures"), "ln::features::InitFeatures" => Some("crate::ln::features::InitFeatures"), - _ => { - eprintln!(" Type {} (ref: {}) unresolvable in C", full_path, is_ref); - None - }, + _ => None, } } @@ -534,10 +531,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { // List of traits we map (possibly during processing of other files): "crate::util::logger::Logger" => Some(""), - _ => { - eprintln!(" Type {} unconvertable from C", full_path); - None - }, + _ => None, }.map(|s| s.to_owned()) } fn from_c_conversion_suffix_from_path<'b>(&self, full_path: &str, is_ref: bool) -> Option { @@ -593,10 +587,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { // List of traits we map (possibly during processing of other files): "crate::util::logger::Logger" => Some(""), - _ => { - eprintln!(" Type {} unconvertable from C", full_path); - None - }, + _ => None, }.map(|s| s.to_owned()) } @@ -678,10 +669,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "ln::features::InitFeatures" if is_ref => Some("Box::into_raw(Box::new(crate::ln::features::InitFeatures { inner: &mut "), "ln::features::InitFeatures" if !is_ref => Some("crate::ln::features::InitFeatures { inner: Box::into_raw(Box::new("), - _ => { - eprintln!(" Type {} (is_ref: {}) unconvertable to C", full_path, is_ref); - None - }, + _ => None, }.map(|s| s.to_owned()) } fn to_c_conversion_inline_suffix_from_path(&self, full_path: &str, is_ref: bool, ptr_for_ref: bool) -> Option { @@ -743,10 +731,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "ln::features::InitFeatures" if is_ref => Some(", is_owned: false }))"), "ln::features::InitFeatures" => Some(")), is_owned: true }"), - _ => { - eprintln!(" Type {} unconvertable to C", full_path); - None - }, + _ => None, }.map(|s| s.to_owned()) } @@ -930,14 +915,12 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { } pub fn mirrored_enum_declared(&mut self, ident: &syn::Ident) { - eprintln!("{} mirrored", ident); self.declared.insert(ident.clone(), DeclType::MirroredEnum); } pub fn enum_ignored(&mut self, ident: &'c syn::Ident) { self.declared.insert(ident.clone(), DeclType::EnumIgnored); } - pub fn struct_imported(&mut self, ident: &'c syn::Ident, named: String) { - eprintln!("Imported {} as {}", ident, named); + pub fn struct_imported(&mut self, ident: &'c syn::Ident) { self.declared.insert(ident.clone(), DeclType::StructImported); } pub fn struct_ignored(&mut self, ident: &syn::Ident) { @@ -945,7 +928,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { self.declared.insert(ident.clone(), DeclType::StructIgnored); } pub fn trait_declared(&mut self, ident: &syn::Ident, t: &'c syn::ItemTrait) { - eprintln!("Trait {} created", ident); self.declared.insert(ident.clone(), DeclType::Trait(t)); } pub fn get_declared_type(&'a self, ident: &syn::Ident) -> Option<&'a DeclType<'c>> { -- 2.30.2