[pull] main from rust-lang:main

src/app_state.rs

@@ -52,8 +52,8 @@ pub enum CheckProgress {
 pub struct AppState {
     current_exercise_ind: usize,
     exercises: Vec<Exercise>,
-    // Caches the number of done exercises to avoid iterating over all exercises every time.
-    n_done: u16,
+    // Cache the number of done exercises to avoid iterating over all exercises every time.
+    n_done: u32,
     final_message: &'static str,
     state_file: File,
     // Preallocated buffer for reading and writing the state file.
@@ -191,13 +191,13 @@ impl AppState {
     }
 
     #[inline]
-    pub fn n_done(&self) -> u16 {
+    pub fn n_done(&self) -> u32 {
         self.n_done
     }
 
     #[inline]
-    pub fn n_pending(&self) -> u16 {
-        self.exercises.len() as u16 - self.n_done
+    pub fn n_pending(&self) -> u32 {
+        self.exercises.len() as u32 - self.n_done
     }
 
     #[inline]
@@ -433,7 +433,7 @@ impl AppState {
                                 .is_err()
                             {
                                 break;
-                            };
+                            }
 
                             let success = exercise.run_exercise(None, &slf.cmd_runner);
                             let progress = match success {

src/info_file.rs

@@ -23,7 +23,7 @@ pub struct ExerciseInfo {
     #[serde(default)]
     pub skip_check_unsolved: bool,
 }
-#[inline(always)]
+#[inline]
 const fn default_true() -> bool {
     true
 }

src/init.rs

@@ -5,7 +5,7 @@ use crossterm::{
 };
 use serde::Deserialize;
 use std::{
-    env::set_current_dir,
+    env::{current_dir, set_current_dir},
     fs::{self, create_dir},
     io::{self, Write},
     path::Path,
@@ -169,14 +169,27 @@ pub fn init() -> Result<()> {
     fs::write(".vscode/extensions.json", VS_CODE_EXTENSIONS_JSON)
         .context("Failed to create the file `rustlings/.vscode/extensions.json`")?;
 
-    if init_git {
-        // Ignore any Git error because Git initialization is not required.
-        let _ = Command::new("git")
-            .arg("init")
-            .stdin(Stdio::null())
-            .stdout(Stdio::null())
-            .stderr(Stdio::null())
-            .status();
+    if init_git && let Ok(dir) = current_dir() {
+        let mut dir = dir.as_path();
+
+        loop {
+            if dir.join(".git").exists() || dir.join(".jj").exists() {
+                break;
+            }
+
+            if let Some(parent) = dir.parent() {
+                dir = parent;
+            } else {
+                // Ignore any Git error because Git initialization is not required.
+                let _ = Command::new("git")
+                    .arg("init")
+                    .stdin(Stdio::null())
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .status();
+                break;
+            }
+        }
     }
 
     stdout.queue(SetForegroundColor(Color::Green))?;

src/list/state.rs

@@ -229,7 +229,7 @@ impl<'a> ListState<'a> {
             progress_bar(
                 &mut MaxLenWriter::new(stdout, self.term_width as usize),
                 self.app_state.n_done(),
-                self.app_state.exercises().len() as u16,
+                self.app_state.exercises().len() as u32,
                 self.term_width,
             )?;
             next_ln(stdout)?;

src/main.rs

@@ -171,9 +171,9 @@ fn main() -> Result<ExitCode> {
                 stdout.write_all(b"\n")?;
 
                 return Ok(ExitCode::FAILURE);
-            } else {
-                app_state.render_final_message(&mut stdout)?;
             }
+
+            app_state.render_final_message(&mut stdout)?;
         }
         Some(Subcommands::Reset { name }) => {
             app_state.set_current_exercise_by_name(&name)?;

src/term.rs

@@ -193,19 +193,19 @@ impl Drop for ProgressCounter<'_, '_> {
 
 pub fn progress_bar<'a>(
     writer: &mut impl CountedWrite<'a>,
-    progress: u16,
-    total: u16,
+    progress: u32,
+    total: u32,
     term_width: u16,
 ) -> io::Result<()> {
-    debug_assert!(total <= 999);
-    debug_assert!(progress <= total);
-
     const PREFIX: &[u8] = b"Progress: [";
     const PREFIX_WIDTH: u16 = PREFIX.len() as u16;
     const POSTFIX_WIDTH: u16 = "] xxx/xxx".len() as u16;
     const WRAPPER_WIDTH: u16 = PREFIX_WIDTH + POSTFIX_WIDTH;
     const MIN_LINE_WIDTH: u16 = WRAPPER_WIDTH + 4;
 
+    debug_assert!(total <= 999);
+    debug_assert!(progress <= total);
+
     if term_width < MIN_LINE_WIDTH {
         writer.write_ascii(b"Progress: ")?;
         // Integers are in ASCII.
@@ -215,7 +215,8 @@ pub fn progress_bar<'a>(
     let stdout = writer.stdout();
     stdout.write_all(PREFIX)?;
 
-    let width = term_width - WRAPPER_WIDTH;
+    // Use u32 to prevent the intermediate multiplication from overflowing
+    let width = u32::from(term_width - WRAPPER_WIDTH);
     let filled = (width * progress) / total;
 
     stdout.queue(SetForegroundColor(Color::Green))?;
@@ -225,14 +226,13 @@ pub fn progress_bar<'a>(
 
     if filled < width {
         stdout.write_all(b">")?;
-    }
 
-    let width_minus_filled = width - filled;
-    if width_minus_filled > 1 {
-        let red_part_width = width_minus_filled - 1;
-        stdout.queue(SetForegroundColor(Color::Red))?;
-        for _ in 0..red_part_width {
-            stdout.write_all(b"-")?;
+        let width_minus_filled = width - filled;
+        if width_minus_filled > 1 {
+            stdout.queue(SetForegroundColor(Color::Red))?;
+            for _ in 1..width_minus_filled {
+                stdout.write_all(b"-")?;
+            }
         }
     }
 

src/watch/state.rs

@@ -60,7 +60,7 @@ impl<'a> WatchState<'a> {
                     watch_event_sender,
                     terminal_event_unpause_receiver,
                     manual_run,
-                )
+                );
             })
             .context("Failed to spawn a thread to handle terminal events")?;
 
@@ -245,7 +245,7 @@ impl<'a> WatchState<'a> {
         progress_bar(
             stdout,
             self.app_state.n_done(),
-            self.app_state.exercises().len() as u16,
+            self.app_state.exercises().len() as u32,
             self.term_width,
         )?;
 

src/watch/terminal_event.rs

@@ -47,7 +47,7 @@ pub fn terminal_event_handler(
                         // Pause input until quitting the confirmation prompt.
                         if unpause_receiver.recv().is_err() {
                             return;
-                        };
+                        }
 
                         continue;
                     }
@@ -64,7 +64,7 @@ pub fn terminal_event_handler(
                     return;
                 }
             }
-            Ok(Event::FocusGained | Event::FocusLost | Event::Mouse(_)) => continue,
+            Ok(Event::FocusGained | Event::FocusLost | Event::Mouse(_)) => (),
             Err(e) => break WatchEvent::TerminalEventErr(e),
         }
     };