Merge 147da28a1f into 3890e12c9e

rslib/src/scheduler/fsrs/params.rs

@@ -478,27 +478,42 @@ pub(crate) fn reviews_for_fsrs(
         }))
         .collect_vec();
 
-    let skip = if training { 1 } else { 0 };
+    let items = if training {
         // Convert the remaining entries into separate FSRSItems, where each item
         // contains all reviews done until then.
-    let items: Vec<(RevlogId, FSRSItem)> = entries
+        let mut items = Vec::with_capacity(entries.len());
-        .iter()
+        let mut current_reviews = Vec::with_capacity(entries.len());
-        .enumerate()
+        for (idx, (entry, &delta_t)) in entries.iter().zip(delta_ts.iter()).enumerate() {
-        .skip(skip)
+            current_reviews.push(FSRSReview {
-        .map(|(outer_idx, entry)| {
+                rating: entry.button_chosen as u32,
+                delta_t,
+            });
+            if idx >= 1 && delta_t > 0 {
+                items.push((
+                    entry.id,
+                    FSRSItem {
+                        reviews: current_reviews.clone(),
+                    },
+                ));
+            }
+        }
+        items
+    } else {
+        // When not training, we only need the final FSRS item, which represents
+        // the complete history of the card. This avoids expensive clones in a loop.
         let reviews = entries
             .iter()
-                .take(outer_idx + 1)
+            .zip(delta_ts.iter())
-                .enumerate()
+            .map(|(entry, &delta_t)| FSRSReview {
-                .map(|(inner_idx, r)| FSRSReview {
+                rating: entry.button_chosen as u32,
-                    rating: r.button_chosen as u32,
+                delta_t,
-                    delta_t: delta_ts[inner_idx],
             })
             .collect();
-            (entry.id, FSRSItem { reviews })
+        let last_entry = entries.last().unwrap();
-        })
+
-        .filter(|(_, item)| !training || item.reviews.last().unwrap().delta_t > 0)
+        vec![(last_entry.id, FSRSItem { reviews })]
-        .collect_vec();
+    };
+
     if items.is_empty() {
         None
     } else {
@@ -738,7 +753,7 @@ pub(crate) mod tests {
                 ],
                 false,
             ),
-            fsrs_items!([review(0)], [review(0), review(1)])
+            fsrs_items!([review(0), review(1)])
         );
     }
 
@@ -809,7 +824,7 @@ pub(crate) mod tests {
         // R | A X R
         assert_eq!(
             convert_ignore_before(revlogs, false, days_ago_ms(9)),
-            fsrs_items!([review(0)], [review(0), review(2)])
+            fsrs_items!([review(0), review(2)])
         );
     }
 
@@ -828,6 +843,9 @@ pub(crate) mod tests {
         assert_eq!(
             convert_ignore_before(revlogs, false, days_ago_ms(9))
                 .unwrap()
+                .last()
+                .unwrap()
+                .reviews
                 .len(),
             2
         );
@@ -849,6 +867,9 @@ pub(crate) mod tests {
         assert_eq!(
             convert_ignore_before(revlogs, false, days_ago_ms(9))
                 .unwrap()
+                .last()
+                .unwrap()
+                .reviews
                 .len(),
             2
         );