Introduce ForEachFn typedef

Introduce the ForEachFn typedef to the inspect functionality. Having
this typedef in place will make it easier to adjust the signature of the
user provided callback/iteration function.

Signed-off-by: Daniel Müller <deso@posteo.net>

src/breakpad/resolver.rs

@@ -9,6 +9,7 @@ use std::path::Path;
 use std::path::PathBuf;
 
 use crate::inspect::FindAddrOpts;
+use crate::inspect::ForEachFn;
 use crate::inspect::Inspect;
 use crate::inspect::SymInfo;
 use crate::mmap::Mmap;
@@ -221,7 +222,7 @@ impl Inspect for BreakpadResolver {
     }
 
     /// Perform an operation on each symbol.
-    fn for_each(&self, opts: &FindAddrOpts, f: &mut dyn FnMut(&SymInfo<'_>)) -> Result<()> {
+    fn for_each(&self, opts: &FindAddrOpts, f: &mut ForEachFn<'_>) -> Result<()> {
         if let SymType::Variable = opts.sym_type {
             return Err(Error::with_unsupported(
                 "breakpad logic does not currently support variable iteration",

src/dwarf/resolver.rs

@@ -20,6 +20,7 @@ use crate::elf::ElfParser;
 use crate::elf::DEFAULT_DEBUG_DIRS;
 use crate::error::IntoCowStr;
 use crate::inspect::FindAddrOpts;
+use crate::inspect::ForEachFn;
 use crate::inspect::Inspect;
 use crate::inspect::SymInfo;
 use crate::log::debug;
@@ -328,7 +329,7 @@ impl Inspect for DwarfResolver {
         }
     }
 
-    fn for_each(&self, _opts: &FindAddrOpts, _f: &mut dyn FnMut(&SymInfo<'_>)) -> Result<()> {
+    fn for_each(&self, _opts: &FindAddrOpts, _f: &mut ForEachFn<'_>) -> Result<()> {
         // TODO: Implement this functionality.
         Err(Error::with_unsupported(
             "DWARF logic does not currently support symbol iteration",

src/elf/parser.rs

@@ -10,6 +10,7 @@ use std::path::PathBuf;
 
 use crate::insert_map::InsertMap;
 use crate::inspect::FindAddrOpts;
+use crate::inspect::ForEachFn;
 use crate::inspect::SymInfo;
 use crate::mmap::Mmap;
 use crate::once::OnceCell;
@@ -790,7 +791,7 @@ impl ElfParser {
         opts: &FindAddrOpts,
         syms: &[&Elf64_Sym],
         str2sym: &[(&str, usize)],
-        f: &mut dyn FnMut(&SymInfo<'_>),
+        f: &mut ForEachFn<'_>,
     ) -> Result<()> {
         let shdrs = self.cache.ensure_shdrs()?;
 
@@ -823,18 +824,14 @@ impl ElfParser {
 
     /// Perform an operation on each symbol.
     #[allow(clippy::needless_borrows_for_generic_args)]
-    pub(crate) fn for_each(
-        &self,
-        opts: &FindAddrOpts,
-        mut f: &mut dyn FnMut(&SymInfo<'_>),
-    ) -> Result<()> {
+    pub(crate) fn for_each(&self, opts: &FindAddrOpts, f: &mut ForEachFn) -> Result<()> {
         let symtab = self.cache.ensure_symtab()?;
         let str2symtab = self.cache.ensure_str2symtab()?;
-        let () = self.for_each_sym_impl(opts, symtab, str2symtab, &mut f)?;
+        let () = self.for_each_sym_impl(opts, symtab, str2symtab, f)?;
 
         let dynsym = self.cache.ensure_dynsym()?;
         let str2dynsym = self.cache.ensure_str2dynsym()?;
-        let () = self.for_each_sym_impl(opts, dynsym, str2dynsym, &mut f)?;
+        let () = self.for_each_sym_impl(opts, dynsym, str2dynsym, f)?;
 
         Ok(())
     }

src/elf/resolver.rs

@@ -11,6 +11,7 @@ use crate::dwarf::DwarfResolver;
 use crate::elf::DEFAULT_DEBUG_DIRS;
 use crate::file_cache::FileCache;
 use crate::inspect::FindAddrOpts;
+use crate::inspect::ForEachFn;
 use crate::inspect::Inspect;
 use crate::inspect::SymInfo;
 use crate::once::OnceCell;
@@ -201,7 +202,7 @@ impl Inspect for ElfResolver {
         }
     }
 
-    fn for_each(&self, opts: &FindAddrOpts, f: &mut dyn FnMut(&SymInfo<'_>)) -> Result<()> {
+    fn for_each(&self, opts: &FindAddrOpts, f: &mut ForEachFn<'_>) -> Result<()> {
         let parser = self.parser();
         parser.deref().for_each(opts, f)
     }

src/inspect/inspector.rs

@@ -10,6 +10,7 @@ use crate::breakpad::BreakpadResolver;
 use crate::elf::ElfResolverData;
 use crate::elf::DEFAULT_DEBUG_DIRS;
 use crate::file_cache::FileCache;
+use crate::inspect::ForEachFn;
 use crate::Result;
 
 #[cfg(feature = "breakpad")]
@@ -164,11 +165,7 @@ impl Inspector {
     where
         F: FnMut(&SymInfo<'_>),
     {
-        fn for_each_impl(
-            slf: &Inspector,
-            src: &Source,
-            f: &mut dyn FnMut(&SymInfo<'_>),
-        ) -> Result<()> {
+        fn for_each_impl(slf: &Inspector, src: &Source, f: &mut ForEachFn<'_>) -> Result<()> {
             let (resolver, opts) = match src {
                 #[cfg(feature = "breakpad")]
                 Source::Breakpad(Breakpad {

src/inspect/mod.rs

@@ -86,6 +86,10 @@ pub(crate) struct FindAddrOpts {
 }
 
 
+/// The signature of a function for iterating over symbols.
+pub(crate) type ForEachFn<'f> = dyn FnMut(&SymInfo<'_>) + 'f;
+
+
 /// The trait providing inspection functionality.
 pub(crate) trait Inspect
 where
@@ -95,5 +99,5 @@ where
     fn find_addr(&self, name: &str, opts: &FindAddrOpts) -> Result<Vec<SymInfo<'_>>>;
 
     /// Perform an operation on each symbol.
-    fn for_each(&self, opts: &FindAddrOpts, f: &mut dyn FnMut(&SymInfo<'_>)) -> Result<()>;
+    fn for_each(&self, opts: &FindAddrOpts, f: &mut ForEachFn<'_>) -> Result<()>;
 }

src/ksym.rs

@@ -9,6 +9,7 @@ use std::path::Path;
 use std::path::PathBuf;
 
 use crate::inspect::FindAddrOpts;
+use crate::inspect::ForEachFn;
 use crate::inspect::Inspect;
 use crate::inspect::SymInfo;
 use crate::once::OnceCell;
@@ -180,7 +181,7 @@ impl Inspect for KSymResolver {
         Ok(syms)
     }
 
-    fn for_each(&self, opts: &FindAddrOpts, f: &mut dyn FnMut(&SymInfo<'_>)) -> Result<()> {
+    fn for_each(&self, opts: &FindAddrOpts, f: &mut ForEachFn<'_>) -> Result<()> {
         if let SymType::Variable = opts.sym_type {
             return Ok(())
         }