return nonsuccessful status code on failed build (FuelLabs#539)

* return nonsuccessful status code on failed build * fmt * fix forc build return type
mitchmindtree · Dec 30, 2021 · 2c4ae1e · 2c4ae1e
1 parent 9dc167b
commit 2c4ae1e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/forc/src/cli/mod.rs b/forc/src/cli/mod.rs
@@ -52,7 +52,5 @@ pub(crate) async fn run_cli() -> Result<(), String> {
         Forc::Update(command) => update::exec(command).await,
         Forc::JsonAbi(command) => json_abi::exec(command),
         Forc::Lsp(command) => lsp::exec(command).await,
-    }?;
-
-    Ok(())
+    }
 }
diff --git a/forc/src/main.rs b/forc/src/main.rs
@@ -4,10 +4,6 @@ mod ops;
 mod utils;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
-    match cli::run_cli().await {
-        Ok(_) => (),
-        Err(e) => println!("Error: {}", e),
-    };
-    Ok(())
+async fn main() -> Result<(), String> {
+    cli::run_cli().await
 }
diff --git a/forc/src/ops/forc_fmt.rs b/forc/src/ops/forc_fmt.rs
@@ -101,14 +101,14 @@ fn format_after_build(command: FormatCommand) -> Result<(), FormatError> {
             if command.check {
                 if contains_edits {
                     // One or more files are not formatted, exit with error
-                    std::process::exit(1);
+                    Err("Files contain formatting violations.".into())
                 } else {
                     // All files are formatted, exit cleanly
-                    std::process::exit(0);
+                    Ok(())
                 }
+            } else {
+                Ok(())
             }
-
-            Ok(())
         }
         _ => Err("Manifest file does not exist".into()),
     }