Remove logger from Config

Author: blairconrad

src/lib.rs

@@ -17,29 +17,22 @@ pub struct Config<'a> {
     pub and_rebase: bool,
     pub whole_file: bool,
     pub one_fixup_per_commit: bool,
-    pub logger: &'a slog::Logger,
 }
 
-pub fn run(config: &Config) -> Result<()> {
+pub fn run(logger: &slog::Logger, config: &Config) -> Result<()> {
     let repo = git2::Repository::open_from_env()?;
-    debug!(config.logger, "repository found"; "path" => repo.path().to_str());
+    debug!(logger, "repository found"; "path" => repo.path().to_str());
 
-    run_with_repo(&config, &repo)
+    run_with_repo(&logger, &config, &repo)
 }
 
-fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
+fn run_with_repo(logger: &slog::Logger, config: &Config, repo: &git2::Repository) -> Result<()> {
     let config = config::unify(&config, repo);
     // have force flag enable all force* flags
 
-    let stack = stack::working_stack(
-        repo,
-        config.base,
-        config.force_author,
-        config.force,
-        config.logger,
-    )?;
+    let stack = stack::working_stack(repo, config.base, config.force_author, config.force, logger)?;
     if stack.is_empty() {
-        crit!(config.logger, "No commits available to fix up, exiting");
+        crit!(logger, "No commits available to fix up, exiting");
         return Ok(());
     }
 
@@ -81,7 +74,7 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
                     diff_options.as_mut(),
                 )?,
             )?;
-            trace!(config.logger, "parsed commit diff";
+            trace!(logger, "parsed commit diff";
                    "commit" => commit.id().to_string(),
                    "diff" => format!("{:?}", diff),
             );
@@ -98,7 +91,7 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
         None,
         diff_options.as_mut(),
     )?)?;
-    trace!(config.logger, "parsed index";
+    trace!(logger, "parsed index";
            "index" => format!("{:?}", index),
     );
 
@@ -113,7 +106,7 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
     'patch: for index_patch in index.iter() {
         let old_path = index_patch.new_path.as_slice();
         if index_patch.status != git2::Delta::Modified {
-            debug!(config.logger, "skipped non-modified hunk";
+            debug!(logger, "skipped non-modified hunk";
                     "path" => String::from_utf8_lossy(old_path).into_owned(),
                     "status" => format!("{:?}", index_patch.status),
             );
@@ -125,7 +118,7 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
         let mut preceding_hunks_offset = 0isize;
         let mut applied_hunks_offset = 0isize;
         'hunk: for index_hunk in &index_patch.hunks {
-            debug!(config.logger, "next hunk";
+            debug!(logger, "next hunk";
                    "header" => index_hunk.header(),
                    "path" => String::from_utf8_lossy(old_path).into_owned(),
             );
@@ -170,7 +163,7 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
             // |   -5,1 +3,0    | -5,1 +4,0 |    -4,1 +3,0     |
             // |----------------|-----------|------------------|
 
-            debug!(config.logger, "";
+            debug!(logger, "";
                 "to apply" => hunk_to_apply.header(),
                 "to commute" => isolated_hunk.header(),
                 "preceding hunks" => format!("{}/{}", applied_hunks_offset, preceding_hunks_offset),
@@ -184,7 +177,7 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
             let mut commuted_index_hunk = isolated_hunk;
 
             'commit: for (commit, diff) in &stack {
-                let c_logger = config.logger.new(o!(
+                let c_logger = logger.new(o!(
                     "commit" => commit.id().to_string(),
                 ));
                 let next_patch = match diff.by_new(commuted_old_path) {
@@ -247,7 +240,7 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
                 // so there is no commit to absorb it into
                 None => {
                     warn!(
-                        config.logger,
+                        logger,
                         "Could not find a commit to fix up, use \
                          --base to increase the search range."
                     );
@@ -319,12 +312,12 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
                     &head_tree,
                     &[&head_commit],
                 )?)?;
-                info!(config.logger, "committed";
+                info!(logger, "committed";
                       "commit" => head_commit.id().to_string(),
                       "header" => format!("+{},-{}", diff.insertions(), diff.deletions()),
                 );
             } else {
-                info!(config.logger, "would have committed";
+                info!(logger, "would have committed";
                       "fixup" => dest_commit_locator,
                       "header" => format!("+{},-{}", diff.insertions(), diff.deletions()),
                 );
@@ -347,14 +340,14 @@ fn run_with_repo(config: &Config, repo: &git2::Repository) -> Result<()> {
     if patches_considered == 0 {
         if index_was_empty && !we_added_everything_to_index {
             warn!(
-                config.logger,
+                logger,
                 "No changes staged, try adding something \
                  to the index or set {} = true",
                 config::AUTO_STAGE_IF_NOTHING_STAGED_CONFIG_NAME
             );
         } else {
             warn!(
-                config.logger,
+                logger,
                 "Could not find a commit to fix up, use \
                  --base to increase the search range."
             )
@@ -495,8 +488,7 @@ mod tests {
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
-        let config = default_config(&logger);
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &DEFAULT_CONFIG, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -514,9 +506,9 @@ mod tests {
         let logger = slog::Logger::root(drain, o!());
         let config = Config {
             one_fixup_per_commit: true,
-            ..default_config(&logger)
+            ..DEFAULT_CONFIG
         };
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &config, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -534,8 +526,7 @@ mod tests {
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
-        let config = default_config(&logger);
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &DEFAULT_CONFIG, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -555,9 +546,9 @@ mod tests {
         let logger = slog::Logger::root(drain, o!());
         let config = Config {
             force_author: true,
-            ..default_config(&logger)
+            ..DEFAULT_CONFIG
         };
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &config, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -577,9 +568,9 @@ mod tests {
         let logger = slog::Logger::root(drain, o!());
         let config = Config {
             force: true,
-            ..default_config(&logger)
+            ..DEFAULT_CONFIG
         };
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &config, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -603,8 +594,7 @@ mod tests {
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
-        let config = default_config(&logger);
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &DEFAULT_CONFIG, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -643,8 +633,7 @@ mod tests {
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
-        let config = default_config(&logger);
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &DEFAULT_CONFIG, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -671,8 +660,7 @@ mod tests {
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
-        let config = default_config(&logger);
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &DEFAULT_CONFIG, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -697,8 +685,7 @@ mod tests {
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
-        let config = default_config(&logger);
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &DEFAULT_CONFIG, &ctx.repo).unwrap();
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
         revwalk.push_head().unwrap();
@@ -720,8 +707,7 @@ mod tests {
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
-        let config = default_config(&logger);
-        run_with_repo(&config, &ctx.repo).unwrap();
+        run_with_repo(&logger, &DEFAULT_CONFIG, &ctx.repo).unwrap();
         assert!(nothing_left_in_index(&ctx.repo).unwrap());
 
         let mut revwalk = ctx.repo.revwalk().unwrap();
@@ -736,16 +722,13 @@ mod tests {
         assert_eq!(actual_msg, expected_msg);
     }
 
-    pub fn default_config(logger: &slog::Logger) -> Config {
-        Config {
-            dry_run: false,
-            force_author: false,
-            force: false,
-            base: None,
-            and_rebase: false,
-            whole_file: false,
-            one_fixup_per_commit: false,
-            logger,
-        }
-    }
+    const DEFAULT_CONFIG: Config = Config {
+        dry_run: false,
+        force_author: false,
+        force: false,
+        base: None,
+        and_rebase: false,
+        whole_file: false,
+        one_fixup_per_commit: false,
+    };
 }

src/main.rs

@@ -89,16 +89,18 @@ fn main() {
         ));
     }
 
-    if let Err(e) = git_absorb::run(&git_absorb::Config {
-        dry_run,
-        force_author,
-        force,
-        base: base.as_deref(),
-        and_rebase,
-        whole_file,
-        one_fixup_per_commit,
-        logger: &logger,
-    }) {
+    if let Err(e) = git_absorb::run(
+        &logger,
+        &git_absorb::Config {
+            dry_run,
+            force_author,
+            force,
+            base: base.as_deref(),
+            and_rebase,
+            whole_file,
+            one_fixup_per_commit,
+        },
+    ) {
         crit!(logger, "absorb failed"; "err" => e.to_string());
         // wait for async logger to finish writing messages
         drop(logger);