From 06af68aa07f4b31fdc4a8a66c5c72d18567e9023 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Tue, 7 Oct 2025 14:37:13 +0200 Subject: [PATCH] Get rid of upwrap in get_synonym, We can't use get_or_insert_with because the index.synonyms(..) returns a Result --- crates/milli/src/search/new/mod.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/milli/src/search/new/mod.rs b/crates/milli/src/search/new/mod.rs index f26fda21f..dec307d31 100644 --- a/crates/milli/src/search/new/mod.rs +++ b/crates/milli/src/search/new/mod.rs @@ -123,11 +123,13 @@ impl<'ctx> SearchContext<'ctx> { /// Get synonyms with caching to avoid repeated database access pub fn get_synonyms(&mut self) -> Result<&HashMap, Vec>>> { - if self.synonym_cache.cache.is_none() { - let synonyms = self.index.synonyms(self.txn)?; - self.synonym_cache.cache = Some(synonyms); + match self.synonym_cache.cache { + Some(ref synonyms) => Ok(synonyms), + None => { + let synonyms = self.index.synonyms(self.txn)?; + Ok(self.synonym_cache.cache.insert(synonyms)) + } } - Ok(self.synonym_cache.cache.as_ref().unwrap()) } pub fn attributes_to_search_on(