Using tracing for logs instead of printing directly

Cargo.toml

@@ -21,7 +21,16 @@ goblin = "0.4"
 regex = "1.3.9"
 rayon = "1.4.0"
 thiserror = "1.0.31"
+tracing = "0.1.35"
+tracing-subscriber = { version = "0.3.14", features = ["env-filter", "local-time"], optional = true }
+time = { version = "0.3.11", optional = true }
+
+[[bin]]
+name = "armerge"
+required-features = ["log_subscriber"]
 
 [features]
+default = ["log_subscriber"]
 # EXPERIMENTAL. Uses objpoke instead of objcopy for localizing ELF symbols in-place. Very fast, but not stable for production use.
 objpoke_symbols = []
+log_subscriber = ["dep:tracing-subscriber", "dep:time"]

src/arbuilder.rs

@@ -10,10 +10,10 @@ pub trait ArBuilder: Debug {
     fn close(self: Box<Self>) -> Result<(), MergeError>;
 }
 
-pub fn host_platform_builder(path: &Path, verbose: bool) -> Box<dyn ArBuilder> {
+pub fn host_platform_builder(path: &Path) -> Box<dyn ArBuilder> {
     if std::env::consts::OS == "macos" {
-        Box::new(mac::MacArBuilder::new(path, verbose))
+        Box::new(mac::MacArBuilder::new(path))
     } else {
-        Box::new(common::CommonArBuilder::new(path, verbose))
+        Box::new(common::CommonArBuilder::new(path))
     }
 }

src/arbuilder/common.rs

@@ -9,7 +9,6 @@ pub struct CommonArBuilder {
     builder: Builder<File>,
     output_path: PathBuf,
     closed: bool,
-    verbose: bool,
 }
 
 impl Debug for CommonArBuilder {
@@ -35,13 +34,12 @@ impl ArBuilder for CommonArBuilder {
 }
 
 impl CommonArBuilder {
-    pub fn new(path: impl Into<PathBuf>, verbose: bool) -> Self {
+    pub fn new(path: impl Into<PathBuf>) -> Self {
         let path = path.into();
         Self {
             builder: Builder::new(File::create(&path).expect("Failed to create output library")),
             output_path: path,
             closed: false,
-            verbose,
         }
     }
 
@@ -51,6 +49,6 @@ impl CommonArBuilder {
         }
         self.closed = true;
 
-        archives::create_index(&self.output_path, self.verbose)
+        archives::create_index(&self.output_path)
     }
 }

src/arbuilder/mac.rs

@@ -4,12 +4,12 @@ use crate::MergeError::ExternalToolLaunchError;
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
 use std::process::Command;
+use tracing::info;
 
 #[derive(Debug)]
 pub struct MacArBuilder {
     output_path: PathBuf,
     obj_paths: Vec<PathBuf>,
-    verbose: bool,
     closed: bool,
 }
 
@@ -25,11 +25,10 @@ impl ArBuilder for MacArBuilder {
 }
 
 impl MacArBuilder {
-    pub fn new(path: &Path, verbose: bool) -> Self {
+    pub fn new(path: &Path) -> Self {
         Self {
             output_path: path.to_owned(),
             obj_paths: vec![],
-            verbose,
             closed: false,
         }
     }
@@ -53,16 +52,15 @@ impl MacArBuilder {
                 .inspect(|_| count += 1)
                 .map(|p| p.as_os_str().into()),
         );
-        if self.verbose {
-            println!(
-                "Merging {} objects: libtool {}",
-                count,
-                args.iter()
-                    .map(|s| s.to_string_lossy())
-                    .collect::<Vec<_>>()
-                    .join(" ")
-            );
-        }
+
+        info!(
+            "Merging {} objects: libtool {}",
+            count,
+            args.iter()
+                .map(|s| s.to_string_lossy())
+                .collect::<Vec<_>>()
+                .join(" ")
+        );
 
         let output =
             Command::new("libtool")

src/archives.rs

@@ -11,6 +11,7 @@ use std::fmt::{Debug, Formatter};
 use std::fs::File;
 use std::io::{Read, Write};
 use tempdir::TempDir;
+use tracing::info;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum ArchiveContents {
@@ -114,12 +115,10 @@ pub fn extract_objects<I: IntoIterator<Item = InputLibrary<R>>, R: Read>(
     })
 }
 
-pub fn create_index(archive_path: &std::path::Path, verbose: bool) -> Result<(), MergeError> {
+pub fn create_index(archive_path: &std::path::Path) -> Result<(), MergeError> {
     use std::process::Command;
 
-    if verbose {
-        println!("ranlib {}", archive_path.to_string_lossy());
-    }
+    info!("ranlib {}", archive_path.to_string_lossy());
 
     let output = Command::new("ranlib")
         .args(vec![archive_path])

src/lib.rs

@@ -16,6 +16,7 @@ use regex::Regex;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
+use tracing::error;
 
 #[derive(Debug)]
 pub struct ArMerger {
@@ -66,15 +67,15 @@ impl ArMerger {
     ) -> Result<Box<dyn ArBuilder>, ProcessInputError> {
         Ok(match contents_type {
             ArchiveContents::Empty => return Err(ProcessInputError::Empty),
-            ArchiveContents::Elf => Box::new(CommonArBuilder::new(output.as_ref(), false)),
-            ArchiveContents::MachO => Box::new(MacArBuilder::new(output.as_ref(), false)),
+            ArchiveContents::Elf => Box::new(CommonArBuilder::new(output.as_ref())),
+            ArchiveContents::MachO => Box::new(MacArBuilder::new(output.as_ref())),
             ArchiveContents::Other => {
-                eprintln!("Input archives contain neither ELF nor Mach-O files, trying to continue with your host toolchain");
-                arbuilder::host_platform_builder(output.as_ref(), false)
+                error!("Input archives contain neither ELF nor Mach-O files, trying to continue with your host toolchain");
+                arbuilder::host_platform_builder(output.as_ref())
             }
             ArchiveContents::Mixed => {
-                eprintln!("Input archives contain different object file formats, trying to continue with your host toolchain");
-                arbuilder::host_platform_builder(output.as_ref(), false)
+                error!("Input archives contain different object file formats, trying to continue with your host toolchain");
+                arbuilder::host_platform_builder(output.as_ref())
             }
         })
     }
@@ -100,7 +101,6 @@ impl ArMerger {
             self.extracted.contents_type,
             self.extracted.object_dir,
             keep_symbols_regexes.into_iter().collect(),
-            false,
         )
     }
 }