Remove many unwrap

src/lang.rs

@@ -500,12 +500,14 @@ impl RandomSRSModule {
 }
 impl SRSModule for RandomSRSModule {
     fn next(&mut self, set: &mut DeckData) -> usize {
-        if self.basket.is_empty() {
-            self.basket = (0..set.words.len()).collect::<Vec<usize>>();
-            self.basket.shuffle(&mut rand::rng())
+        match self.basket.pop() {
+            Some(index) => index,
+            None => {
+                self.basket = (0..set.words.len()).collect::<Vec<usize>>();
+                self.basket.shuffle(&mut rand::rng());
+                self.basket.pop().expect("empty basket")
+            }
         }
-
-        self.basket.pop().unwrap()
     }
 
     fn open(&mut self, _: WordOpenMode, _: usize, _: CardStatistics) {}
@@ -552,7 +554,7 @@ impl SRSModule for SemiRandomSRSModule {
         let new_weight = (100.0 / word.calculated_score()).powf(2.0);
         self.last_weights
             .update_weights(&[(index, &new_weight)])
-            .unwrap();
+            .expect("update weights error");
     }
     fn init(&mut self, set: &mut DeckData) {
         self.initialized = true;
@@ -585,12 +587,16 @@ impl SRSModule for WorstWordsSRSModule {
             self.rounds_remaining = self.rounds_count;
         }
 
-        if self.queue.is_empty() {
-            self.queue.append(&mut self.pool.clone());
-            self.rounds_remaining -= 1;
+        match self.queue.pop() {
+            Some(index) => {
+                index
+            }
+            None => {
+                self.queue.append(&mut self.pool.clone());
+                self.rounds_remaining -= 1;
+                self.queue.pop().expect("empty queue")
+            }
         }
-
-        self.queue.pop().unwrap()
     }
 
     fn open(&mut self, _: WordOpenMode, _: usize, _: CardStatistics) {}