mirror/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-09-18 11:31:35 +02:00
Code Issues

Simplify next_pending_exercise_ind

Browse Source
This commit is contained in:
mo8it 2024-08-29 01:59:04 +02:00
parent fc1f9f0124
commit fd2bf9f6f6
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/app_state.rs
View File

@ -313,25 +313,22 @@ impl AppState {
// Return the index of the next pending exercise or `None` if all exercises are done. // Return the index of the next pending exercise or `None` if all exercises are done.
fn next_pending_exercise_ind(&self) -> Option<usize> { fn next_pending_exercise_ind(&self) -> Option<usize> {
if self.current_exercise_ind + 1 == self.exercises.len() { let next_ind = self.current_exercise_ind + 1;
// The last exercise is done. self.exercises
// Search for exercises not done from the start. // If the exercise done isn't the last, search for pending exercises after it.
return self.exercises[..self.current_exercise_ind] .get(next_ind..)
.iter() .and_then(|later_exercises| {
.position(|exercise| !exercise.done); later_exercises
} .iter()
.position(|exercise| !exercise.done)
// The done exercise isn't the last one. .map(|ind| next_ind + ind)
// Search for a pending exercise after the current one and then from the start. })
match self.exercises[self.current_exercise_ind + 1..] // Search from the start.
.iter() .or_else(|| {
.position(|exercise| !exercise.done) self.exercises[..self.current_exercise_ind]
{ .iter()
Some(ind) => Some(self.current_exercise_ind + 1 + ind), .position(|exercise| !exercise.done)
None => self.exercises[..self.current_exercise_ind] })
.iter()
.position(|exercise| !exercise.done),
}
} }
/// Official exercises: Dump the solution file form the binary and return its path. /// Official exercises: Dump the solution file form the binary and return its path.