Cleanup and format

src/core/deck.rs

@@ -1,5 +1,5 @@
 use crate::app::AppState;
-use crate::core::srs::OrderModule::{WorstWordsSRS, FSRS, RandomSRS, SemiRandomSRS};
+use crate::core::srs::OrderModule::{Fsrs, RandomSRS, SemiRandomSRS, WorstWordsSRS};
 use crate::core::srs::{
     FsrsModule, OrderMode, OrderModule, RandomSRSModule, SRSModule, SemiRandomSRSModule,
     WordOpenMode, WorstWordsSRSModule,
@@ -48,7 +48,7 @@ impl DeckData {
             words,
             current_word_index: None,
             state: state_for,
-            order_module: FSRS(FsrsModule::new()),
+            order_module: Fsrs(FsrsModule::new()),
             open_mode: settings.open_mode,
             settings: settings.clone(),
         })
@@ -75,7 +75,7 @@ impl DeckData {
                 }
                 module.next(self.set.as_slice())
             }
-            FSRS(ref mut module) => {
+            Fsrs(ref mut module) => {
                 if !module.initialized {
                     module.init(self.set.as_slice())
                 }
@@ -103,22 +103,18 @@ impl DeckData {
                 WorstWordsSRS(ref mut module) => {
                     module.open(status, index, word);
                 }
-                FSRS(ref mut module) => {
+                Fsrs(ref mut module) => {
                     module.open(status, index, word);
                 }
             }
 
-            if let FSRS(ref fsrs) = self.order_module {
-                if fsrs.finished() {
-                    self.order_module = match self.open_mode {
-                        OrderMode::Default => {
-                            SemiRandomSRS(SemiRandomSRSModule::new())
-                        }
-                        OrderMode::TrainWorstFirst => {
-                            WorstWordsSRS(WorstWordsSRSModule::new())
-                        }
-                        OrderMode::FullRandom => RandomSRS(RandomSRSModule::new()),
-                    }
+            if let Fsrs(ref fsrs) = self.order_module
+                && fsrs.finished()
+            {
+                self.order_module = match self.open_mode {
+                    OrderMode::Default => SemiRandomSRS(SemiRandomSRSModule::new()),
+                    OrderMode::TrainWorstFirst => WorstWordsSRS(WorstWordsSRSModule::new()),
+                    OrderMode::FullRandom => RandomSRS(RandomSRSModule::new()),
                 }
             }
             update_stat_score(word, &self.state.lock().connection)?;