From 326169a7fabacda9a21377b110371f91b32e8fd3 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Sun, 13 Oct 2024 22:02:41 +0200
Subject: Improve check-all command

---
 src/run.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/run.rs')

diff --git a/src/run.rs b/src/run.rs
index 3fddcf2..f259f52 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -5,7 +5,7 @@ use crossterm::{
 };
 use std::{
     io::{self, Write},
-    process::exit,
+    process::ExitCode,
 };
 
 use crate::{
@@ -13,7 +13,7 @@ use crate::{
     exercise::{solution_link_line, RunnableExercise, OUTPUT_CAPACITY},
 };
 
-pub fn run(app_state: &mut AppState) -> Result<()> {
+pub fn run(app_state: &mut AppState) -> Result<ExitCode> {
     let exercise = app_state.current_exercise();
     let mut output = Vec::with_capacity(OUTPUT_CAPACITY);
     let success = exercise.run_exercise(Some(&mut output), app_state.cmd_runner())?;
@@ -29,7 +29,7 @@ pub fn run(app_state: &mut AppState) -> Result<()> {
             .current_exercise()
             .terminal_file_link(&mut stdout)?;
         stdout.write_all(b" with errors\n")?;
-        exit(1);
+        return Ok(ExitCode::FAILURE);
     }
 
     stdout.queue(SetForegroundColor(Color::Green))?;
@@ -55,5 +55,5 @@ pub fn run(app_state: &mut AppState) -> Result<()> {
         ExercisesProgress::AllDone => (),
     }
 
-    Ok(())
+    Ok(ExitCode::SUCCESS)
 }
-- 
cgit v1.2.3


From 932bc25d8824e18debc91e5f25f022e8d066bcf8 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Mon, 14 Oct 2024 01:28:34 +0200
Subject: Remove unneeded line

---
 src/main.rs        | 2 +-
 src/run.rs         | 1 +
 src/watch/state.rs | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/run.rs')

diff --git a/src/main.rs b/src/main.rs
index 5616d26..c8bcd2e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -152,7 +152,6 @@ fn main() -> Result<ExitCode> {
                 }
 
                 stdout.write_all(b"\n\n")?;
-
                 let pending = app_state.n_pending();
                 if pending == 1 {
                     stdout.write_all(b"One exercise pending: ")?;
@@ -167,6 +166,7 @@ fn main() -> Result<ExitCode> {
                     .current_exercise()
                     .terminal_file_link(&mut stdout)?;
                 stdout.write_all(b"\n")?;
+
                 return Ok(ExitCode::FAILURE);
             } else {
                 app_state.render_final_message(&mut stdout)?;
diff --git a/src/run.rs b/src/run.rs
index f259f52..ac8b26a 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -29,6 +29,7 @@ pub fn run(app_state: &mut AppState) -> Result<ExitCode> {
             .current_exercise()
             .terminal_file_link(&mut stdout)?;
         stdout.write_all(b" with errors\n")?;
+
         return Ok(ExitCode::FAILURE);
     }
 
diff --git a/src/watch/state.rs b/src/watch/state.rs
index 8b58e31..0ac758c 100644
--- a/src/watch/state.rs
+++ b/src/watch/state.rs
@@ -281,8 +281,6 @@ impl<'a> WatchState<'a> {
     }
 
     pub fn check_all_exercises(&mut self, stdout: &mut StdoutLock) -> Result<ExercisesProgress> {
-        stdout.write_all(b"\n")?;
-
         if let Some(first_pending_exercise_ind) = self.app_state.check_all_exercises(stdout)? {
             // Only change exercise if the current one is done.
             if self.app_state.current_exercise().done {
-- 
cgit v1.2.3