Apply suggestions from code review

Co-authored-by: Nicolas Polomack <[email protected]>
Hirevo · Jun 12, 2023 · feec52e · feec52e
1 parent 5f400fb
commit feec52e
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/crates/alexandrie/src/fts/index.rs b/crates/alexandrie/src/fts/index.rs
@@ -395,18 +395,30 @@ impl Tantivy {
                     let mut doc: TantivyDocument = krate.into();
 
                     // Skip keywords that might be orphan and add keywords that match ids
-                    while current_keyword.is_some() && current_keyword.as_ref().unwrap().0 <= id {
-                        if current_keyword.as_ref().unwrap().0 == id {
-                            doc.add_keyword(current_keyword.unwrap().1);
+                    while let Some((crate_id, keyword)) = current_keyword {
+                        if crate_id > id {
+                            current_keyword = Some((crate_id, keyword));
+                            break;
                         }
+
+                        if crate_id == id {
+                            doc.add_keyword(keyword);
+                        }
+
                         current_keyword = keywords_iterator.next();
                     }
 
-                    // Skip keywords that might be orphan and add keywords that match ids
-                    while current_category.is_some() && current_category.as_ref().unwrap().0 <= id {
-                        if current_category.as_ref().unwrap().0 == id {
-                            doc.add_keyword(current_category.unwrap().1);
+                    // Skip categories that might be orphan and add categories that match ids
+                    while let Some((crate_id, category)) = current_category {
+                        if crate_id > id {
+                            current_category = Some((crate_id, category));
+                            break;
                         }
+
+                        if crate_id == id {
+                            doc.add_category(category);
+                        }
+
                         current_category = categories_iterator.next();
                     }