Use the Error enum everywhere in the project

milli/src/search/distinct/facet_distinct.rs

@@ -5,7 +5,7 @@ use roaring::RoaringBitmap;
 
 use super::{Distinct, DocIter};
 use crate::heed_codec::facet::*;
-use crate::{DocumentId, FieldId, Index};
+use crate::{DocumentId, FieldId, Index, Result};
 
 const FID_SIZE: usize = size_of::<FieldId>();
 const DOCID_SIZE: usize = size_of::<DocumentId>();
@@ -57,7 +57,7 @@ impl<'a> FacetDistinctIter<'a> {
             .get(self.txn, &(self.distinct, 0, key, key))
     }
 
-    fn distinct_string(&mut self, id: DocumentId) -> anyhow::Result<()> {
+    fn distinct_string(&mut self, id: DocumentId) -> Result<()> {
         let iter = facet_string_values(id, self.distinct, self.index, self.txn)?;
 
         for item in iter {
@@ -73,7 +73,7 @@ impl<'a> FacetDistinctIter<'a> {
         Ok(())
     }
 
-    fn distinct_number(&mut self, id: DocumentId) -> anyhow::Result<()> {
+    fn distinct_number(&mut self, id: DocumentId) -> Result<()> {
         let iter = facet_number_values(id, self.distinct, self.index, self.txn)?;
 
         for item in iter {
@@ -92,7 +92,7 @@ impl<'a> FacetDistinctIter<'a> {
     /// Performs the next iteration of the facet distinct. This is a convenience method that is
     /// called by the Iterator::next implementation that transposes the result. It makes error
     /// handling easier.
-    fn next_inner(&mut self) -> anyhow::Result<Option<DocumentId>> {
+    fn next_inner(&mut self) -> Result<Option<DocumentId>> {
         // The first step is to remove all the excluded documents from our candidates
         self.candidates.difference_with(&self.excluded);
 
@@ -129,7 +129,7 @@ fn facet_number_values<'a>(
     distinct: FieldId,
     index: &Index,
     txn: &'a heed::RoTxn,
-) -> anyhow::Result<heed::RoPrefix<'a, FieldDocIdFacetF64Codec, heed::types::Unit>> {
+) -> Result<heed::RoPrefix<'a, FieldDocIdFacetF64Codec, heed::types::Unit>> {
     let key = facet_values_prefix_key(distinct, id);
 
     let iter = index
@@ -146,7 +146,7 @@ fn facet_string_values<'a>(
     distinct: FieldId,
     index: &Index,
     txn: &'a heed::RoTxn,
-) -> anyhow::Result<heed::RoPrefix<'a, FieldDocIdFacetStringCodec, heed::types::Unit>> {
+) -> Result<heed::RoPrefix<'a, FieldDocIdFacetStringCodec, heed::types::Unit>> {
     let key = facet_values_prefix_key(distinct, id);
 
     let iter = index
@@ -159,7 +159,7 @@ fn facet_string_values<'a>(
 }
 
 impl Iterator for FacetDistinctIter<'_> {
-    type Item = anyhow::Result<DocumentId>;
+    type Item = Result<DocumentId>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.next_inner().transpose()

milli/src/search/distinct/mod.rs

@@ -3,13 +3,13 @@ mod noop_distinct;
 
 use roaring::RoaringBitmap;
 
-use crate::DocumentId;
+use crate::{DocumentId, Result};
 pub use facet_distinct::FacetDistinct;
 pub use noop_distinct::NoopDistinct;
 
 /// A trait implemented by document interators that are returned by calls to `Distinct::distinct`.
 /// It provides a way to get back the ownership to the excluded set.
-pub trait DocIter: Iterator<Item = anyhow::Result<DocumentId>> {
+pub trait DocIter: Iterator<Item = Result<DocumentId>> {
     /// Returns ownership on the internal exluded set.
     fn into_excluded(self) -> RoaringBitmap;
 }
@@ -106,7 +106,7 @@ mod test {
 
     /// Checks that all the candidates are distinct, and returns the candidates number.
     pub(crate) fn validate_distinct_candidates(
-        candidates: impl Iterator<Item=anyhow::Result<DocumentId>>,
+        candidates: impl Iterator<Item = crate::Result<DocumentId>>,
         distinct: FieldId,
         index: &Index,
         ) -> usize {

milli/src/search/distinct/noop_distinct.rs

@@ -1,6 +1,6 @@
 use roaring::{RoaringBitmap, bitmap::IntoIter};
 
-use crate::DocumentId;
+use crate::{DocumentId, Result};
 use super::{DocIter, Distinct};
 
 /// A distinct implementer that does not perform any distinct,
@@ -13,7 +13,7 @@ pub struct NoopDistinctIter {
 }
 
 impl Iterator for NoopDistinctIter {
-    type Item = anyhow::Result<DocumentId>;
+    type Item = Result<DocumentId>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.candidates.next().map(Ok)