Deduplicate logic to call discovery callback.

No functional change - just deduplicating the logic which calls this callback, which will make it easier to make further changes in future. Part of google/autocxx#124

Author: adetaylor

bindgen/codegen/mod.rs

@@ -993,16 +993,13 @@ impl CodeGenerator for Type {
 
  let rust_name = ctx.rust_ident(&name);
 
- ctx.options().for_each_callback(|cb| {
- cb.new_item_found(
- DiscoveredItemId::new(item.id().as_usize()),
- DiscoveredItem::Alias {
- alias_name: rust_name.to_string(),
- alias_for: DiscoveredItemId::new(
- inner_item.id().as_usize(),
- ),
- },
- );
+ utils::call_discovered_item_callback(ctx, item, || {
+ DiscoveredItem::Alias {
+ alias_name: rust_name.to_string(),
+ alias_for: DiscoveredItemId::new(
+ inner_item.id().as_usize(),
+ ),
+ }
  });
 
  let mut tokens = if let Some(comment) = item.comment(ctx) {
@@ -2477,28 +2474,23 @@ impl CodeGenerator for CompInfo {
 
  let is_rust_union = is_union && struct_layout.is_rust_union();
 
- let discovered_id = DiscoveredItemId::new(item.id().as_usize());
- ctx.options().for_each_callback(|cb| {
- let discovered_item = match self.kind() {
- CompKind::Struct => DiscoveredItem::Struct {
- original_name: item
- .kind()
- .expect_type()
- .name()
- .map(String::from),
- final_name: canonical_ident.to_string(),
- },
- CompKind::Union => DiscoveredItem::Union {
- original_name: item
- .kind()
- .expect_type()
- .name()
- .map(String::from),
- final_name: canonical_ident.to_string(),
- },
- };
-
- cb.new_item_found(discovered_id, discovered_item);
+ utils::call_discovered_item_callback(ctx, item, || match self.kind() {
+ CompKind::Struct => DiscoveredItem::Struct {
+ original_name: item
+ .kind()
+ .expect_type()
+ .name()
+ .map(String::from),
+ final_name: canonical_ident.to_string(),
+ },
+ CompKind::Union => DiscoveredItem::Union {
+ original_name: item
+ .kind()
+ .expect_type()
+ .name()
+ .map(String::from),
+ final_name: canonical_ident.to_string(),
+ },
  });
 
  // The custom derives callback may return a list of derive attributes;
@@ -2696,6 +2688,7 @@ impl CodeGenerator for CompInfo {
  }
 
  let mut method_names = Default::default();
+ let discovered_id = DiscoveredItemId::new(item.id().as_usize());
  if ctx.options().codegen_config.methods() {
  for method in self.methods() {
  assert_ne!(method.kind(), MethodKind::Constructor);
@@ -3017,7 +3010,6 @@ impl Method {
 
  // First of all, output the actual function.
  let function_item = ctx.resolve_item(self.signature());
- let id = DiscoveredItemId::new(function_item.id().as_usize());
  if !function_item.process_before_codegen(ctx, result) {
  return;
  }
@@ -3064,14 +3056,11 @@ impl Method {
 
  method_names.insert(name.clone());
 
- ctx.options().for_each_callback(|cb| {
- cb.new_item_found(
- id,
- DiscoveredItem::Method {
- parent: parent_id,
- final_name: name.clone(),
- },
- );
+ utils::call_discovered_item_callback(ctx, function_item, || {
+ DiscoveredItem::Method {
+ parent: parent_id,
+ final_name: name.clone(),
+ }
  });
 
  let mut function_name = function_item.canonical_name(ctx);
@@ -3801,13 +3790,10 @@ impl CodeGenerator for Enum {
  let repr = repr.to_rust_ty_or_opaque(ctx, item);
  let has_typedef = ctx.is_enum_typedef_combo(item.id());
 
- ctx.options().for_each_callback(|cb| {
- cb.new_item_found(
- DiscoveredItemId::new(item.id().as_usize()),
- DiscoveredItem::Enum {
- final_name: name.to_string(),
- },
- );
+ utils::call_discovered_item_callback(ctx, item, || {
+ DiscoveredItem::Enum {
+ final_name: name.to_string(),
+ }
  });
 
  let mut builder = EnumBuilder::new(
@@ -4592,7 +4578,6 @@ impl CodeGenerator for Function {
  ) -> Self::Return {
  debug!("<Function as CodeGenerator>::codegen: item = {item:?}");
  debug_assert!(item.is_enabled_for_codegen(ctx));
- let id = DiscoveredItemId::new(item.id().as_usize());
 
  let is_internal = matches!(self.linkage(), Linkage::Internal);
 
@@ -4709,13 +4694,10 @@ impl CodeGenerator for Function {
  if times_seen > 0 {
  write!(&mut canonical_name, "{times_seen}").unwrap();
  }
- ctx.options().for_each_callback(|cb| {
- cb.new_item_found(
- id,
- DiscoveredItem::Function {
- final_name: canonical_name.to_string(),
- },
- );
+ utils::call_discovered_item_callback(ctx, item, || {
+ DiscoveredItem::Function {
+ final_name: canonical_name.to_string(),
+ }
  });
 
  let link_name_attr = self.link_name().or_else(|| {
@@ -5256,6 +5238,7 @@ pub(crate) mod utils {
  use super::helpers::BITFIELD_UNIT;
  use super::serialize::CSerialize;
  use super::{error, CodegenError, CodegenResult, ToRustTyOrOpaque};
+ use crate::callbacks::DiscoveredItemId;
  use crate::ir::context::BindgenContext;
  use crate::ir::context::TypeId;
  use crate::ir::function::{Abi, ClangAbi, FunctionSig};
@@ -5985,4 +5968,17 @@ pub(crate) mod utils {
 
  true
  }
+
+ pub(super) fn call_discovered_item_callback(
+ ctx: &BindgenContext,
+ item: &Item,
+ discovered_item_creator: impl Fn() -> crate::callbacks::DiscoveredItem,
+ ) {
+ ctx.options().for_each_callback(|cb| {
+ cb.new_item_found(
+ DiscoveredItemId::new(item.id().as_usize()),
+ discovered_item_creator(),
+ );
+ });
+ }
 }