Pass through exit code of run commands

Author: phil-opp

src/bin/cargo-bootimage.rs

@@ -1,8 +1,3 @@
-use std::process;
-
 pub fn main() {
-    if let Err(err) = bootimage::run() {
-        eprintln!("Error: {}", err.message);
-        process::exit(err.exit_code);
-    }
+    bootimage::lib_main();
 }

src/lib.rs

@@ -1,5 +1,5 @@
 use args::{Args, RunnerArgs, TesterArgs};
-use std::fmt;
+use std::{fmt, process};
 
 pub mod args;
 pub mod builder;
@@ -25,20 +25,34 @@ enum Command {
     Version,
 }
 
-pub fn run() -> Result<(), ErrorString> {
+pub fn lib_main() {
+    match run() {
+        Err(err) => {
+            eprintln!("Error: {}", err.message);
+            process::exit(err.exit_code);
+        }
+        Ok(Some(exit_code)) => {
+            process::exit(exit_code);
+        }
+        Ok(None) => {}
+    }
+}
+
+pub fn run() -> Result<Option<i32>, ErrorString> {
     let command = args::parse_args()?;
+    let none = |()| None;
     match command {
-        Command::Build(args) => subcommand::build::build(args),
-        Command::Run(args) => subcommand::run::run(args),
-        Command::Test(args) => subcommand::test::test(args),
-        Command::Runner(args) => subcommand::runner::runner(args),
-        Command::Tester(args) => subcommand::tester::tester(args),
+        Command::Build(args) => subcommand::build::build(args).map(none),
+        Command::Run(args) => subcommand::run::run(args).map(Some),
+        Command::Test(args) => subcommand::test::test(args).map(none),
+        Command::Runner(args) => subcommand::runner::runner(args).map(Some),
+        Command::Tester(args) => subcommand::tester::tester(args).map(none),
         Command::NoSubcommand => help::no_subcommand(),
-        Command::Help => Ok(help::help()),
-        Command::BuildHelp => Ok(help::build_help()),
-        Command::RunHelp => Ok(help::run_help()),
-        Command::TestHelp => Ok(help::test_help()),
-        Command::Version => Ok(println!("bootimage {}", env!("CARGO_PKG_VERSION"))),
+        Command::Help => Ok(help::help()).map(none),
+        Command::BuildHelp => Ok(help::build_help()).map(none),
+        Command::RunHelp => Ok(help::run_help()).map(none),
+        Command::TestHelp => Ok(help::test_help()).map(none),
+        Command::Version => Ok(println!("bootimage {}", env!("CARGO_PKG_VERSION"))).map(none),
         Command::RunnerHelp | Command::TesterHelp | Command::CargoBootimageHelp => unimplemented!(),
     }
 }

src/main.rs

@@ -1,8 +1,3 @@
-use std::process;
-
 pub fn main() {
-    if let Err(err) = bootimage::run() {
-        eprintln!("Error: {}", err.message);
-        process::exit(err.exit_code);
-    }
+    bootimage::lib_main();
 }

src/subcommand/run.rs

@@ -1,7 +1,7 @@
 use crate::{args::Args, builder::Builder, config, ErrorString};
 use std::process;
 
-pub(crate) fn run(mut args: Args) -> Result<(), ErrorString> {
+pub(crate) fn run(mut args: Args) -> Result<i32, ErrorString> {
     use crate::subcommand::build;
 
     let builder = Builder::new(args.manifest_path().clone())?;
@@ -27,11 +27,11 @@ pub(crate) fn run(mut args: Args) -> Result<(), ErrorString> {
         );
     }
     command.args(&args.run_args);
-    command.status().map_err(|err| {
+    let exit_status = command.status().map_err(|err| {
         ErrorString::from(format!(
             "Failed to execute run command `{:?}`: {}",
             command, err
         ))
     })?;
-    Ok(())
+    Ok(exit_status.code().unwrap_or(1))
 }

src/subcommand/runner.rs

@@ -1,7 +1,7 @@
 use crate::{args::RunnerArgs, builder::Builder, ErrorString};
 use std::{fs, process};
 
-pub(crate) fn runner(args: RunnerArgs) -> Result<(), ErrorString> {
+pub(crate) fn runner(args: RunnerArgs) -> Result<i32, ErrorString> {
     let builder = Builder::new(None)?;
 
     let bootimage_bin = {
@@ -58,16 +58,5 @@ pub(crate) fn runner(args: RunnerArgs) -> Result<(), ErrorString> {
         .output()
         .map_err(|e| format!("Failed to execute `{:?}`: {}", command, e))?;
 
-    if !output.status.success() {
-        return Err(ErrorString {
-            exit_code: output.status.code().unwrap_or(1),
-            message: Box::new(format!(
-                "Command `{:?}` failed:\n{}",
-                command,
-                String::from_utf8_lossy(&output.stderr)
-            )),
-        });
-    }
-
-    Ok(())
+    Ok(output.status.code().unwrap_or(1))
 }