refactor(effects): return exit code instead of exiting

Author: JamieMason

src/effects/fix.rs

@@ -3,7 +3,7 @@ use {
   log::warn,
 };
 
-pub fn run(ctx: Context) -> ! {
+pub fn run(ctx: Context) -> i32 {
   let mut contains_unfixable_issues = false;
   let mut was_invalid = false;
 
@@ -59,5 +59,9 @@ pub fn run(ctx: Context) -> ! {
     ui::util::print_no_issues_found();
   }
 
-  std::process::exit(if contains_unfixable_issues { 1 } else { 0 });
+  if contains_unfixable_issues {
+    1
+  } else {
+    0
+  }
 }

src/effects/format.rs

@@ -1,14 +1,14 @@
 use crate::{context::Context, effects::ui};
 
-pub fn run(ctx: Context) -> ! {
+pub fn run(ctx: Context) -> i32 {
   if ctx.config.cli.check {
     check_formatting(ctx)
   } else {
     fix_formatting(ctx)
   }
 }
 
-fn check_formatting(ctx: Context) -> ! {
+fn check_formatting(ctx: Context) -> i32 {
   let mut is_invalid = false;
   ctx
     .packages
@@ -25,10 +25,14 @@ fn check_formatting(ctx: Context) -> ! {
   if !is_invalid {
     ui::util::print_no_issues_found();
   }
-  std::process::exit(if is_invalid { 1 } else { 0 });
+  if is_invalid {
+    1
+  } else {
+    0
+  }
 }
 
-fn fix_formatting(ctx: Context) -> ! {
+fn fix_formatting(ctx: Context) -> i32 {
   let mut was_invalid = false;
   ctx
     .packages
@@ -53,8 +57,10 @@ fn fix_formatting(ctx: Context) -> ! {
       package.borrow().write_to_disk(&ctx.config);
     });
   }
-  if !was_invalid {
+  if was_invalid {
+    1
+  } else {
     ui::util::print_no_issues_found();
+    0
   }
-  std::process::exit(0);
 }

src/effects/lint.rs

@@ -1,7 +1,7 @@
 use crate::{context::Context, effects::ui};
 
 /// Run the lint command side effects
-pub fn run(ctx: Context) -> ! {
+pub fn run(ctx: Context) -> i32 {
   let mut is_invalid = false;
 
   ctx.get_version_groups().for_each(|group| {
@@ -28,9 +28,10 @@ pub fn run(ctx: Context) -> ! {
     });
   });
 
-  if !is_invalid {
+  if is_invalid {
+    1
+  } else {
     ui::util::print_no_issues_found();
+    0
   }
-
-  std::process::exit(if is_invalid { 1 } else { 0 });
 }

src/effects/list.rs

@@ -1,6 +1,6 @@
 use crate::{context::Context, effects::ui};
 
-pub fn run(ctx: Context) -> ! {
+pub fn run(ctx: Context) -> i32 {
   let mut is_invalid = false;
 
   ctx
@@ -25,5 +25,9 @@ pub fn run(ctx: Context) -> ! {
     ui::util::print_no_issues_found();
   }
 
-  std::process::exit(if is_invalid { 1 } else { 0 });
+  if is_invalid {
+    1
+  } else {
+    0
+  }
 }

src/effects/update.rs

@@ -7,7 +7,7 @@ use {
   log::{error, warn},
 };
 
-pub fn run(ctx: Context) -> ! {
+pub fn run(ctx: Context) -> i32 {
   let mut was_outdated = false;
 
   ctx
@@ -58,7 +58,7 @@ pub fn run(ctx: Context) -> ! {
   }
 
   if ctx.config.cli.check {
-    std::process::exit(if was_outdated { 1 } else { 0 });
+    return if was_outdated { 1 } else { 0 };
   }
 
   if !ctx.config.cli.dry_run {
@@ -67,5 +67,5 @@ pub fn run(ctx: Context) -> ! {
     });
   }
 
-  std::process::exit(0);
+  0
 }

src/main.rs

@@ -68,31 +68,33 @@ async fn main() {
 
   let ctx = Context::create(config, packages, None);
 
-  match ctx.config.cli.subcommand {
+  let _exit_code = match ctx.config.cli.subcommand {
     Subcommand::Fix => {
       let ctx = visit_packages(ctx);
-      fix::run(ctx);
+      fix::run(ctx)
     }
     Subcommand::Format => {
       let ctx = visit_formatting(ctx);
-      format::run(ctx);
+      format::run(ctx)
     }
     Subcommand::Lint => {
       let ctx = visit_packages(ctx);
-      lint::run(ctx);
+      lint::run(ctx)
     }
     Subcommand::Update => {
       let mut ctx = ctx;
       ctx.fetch_all_updates().await;
       let ctx = visit_packages(ctx);
-      update::run(ctx);
+      update::run(ctx)
     }
     Subcommand::List => {
       let ctx = visit_packages(ctx);
-      list::run(ctx);
+      list::run(ctx)
     }
   };
 
   #[cfg(feature = "dhat-heap")]
   drop(_profiler);
+
+  exit(_exit_code);
 }