fix issues introduced with cherry-pick

Author: dae

rslib/src/card.rs

@@ -152,7 +152,11 @@ impl Card {
     pub(crate) fn restore_queue_after_bury_or_suspend(&mut self) {
         self.queue = match self.ctype {
             CardType::Learn | CardType::Relearn => {
-                let original_due = if self.odue > 0 { self.odue } else { self.due };
+                let original_due = if self.original_due > 0 {
+                    self.original_due
+                } else {
+                    self.due
+                };
                 if original_due > 1_000_000_000 {
                     // previous interval was in seconds
                     CardQueue::Learn

rslib/src/storage/card/mod.rs

@@ -4,7 +4,7 @@
 use crate::{
     card::{Card, CardID, CardQueue, CardType},
     deckconf::DeckConfID,
-    decks::{Deck, DeckID, DeckKind},
+    decks::{DeckID, DeckKind},
     err::Result,
     notes::NoteID,
     timestamp::{TimestampMillis, TimestampSecs},
@@ -281,7 +281,6 @@ impl super::SqliteStorage {
         Ok(())
     }
 
-
     /// Fix cards with low eases due to schema 15 bug.
     /// Deck configs were defaulting to 2.5% ease, which was capped to
     /// 130% when the deck options were edited for the first time.
@@ -313,7 +312,6 @@ impl super::SqliteStorage {
 
         Ok(())
     }
-
 }
 
 #[cfg(test)]