From a370b467fe055633df4772e2a493b948df4bfd69 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Tue, 11 Mar 2025 15:31:57 +0100 Subject: [PATCH] Merge `MetadataBuilder::_new` into `MetadataBuilder::new` --- crates/milli/src/fields_ids_map/metadata.rs | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/crates/milli/src/fields_ids_map/metadata.rs b/crates/milli/src/fields_ids_map/metadata.rs index 0d8c3bd4b..89b0a446b 100644 --- a/crates/milli/src/fields_ids_map/metadata.rs +++ b/crates/milli/src/fields_ids_map/metadata.rs @@ -223,7 +223,7 @@ impl MetadataBuilder { let distinct_attribute = index.distinct_field(rtxn)?.map(|s| s.to_string()); let asc_desc_attributes = index.asc_desc_fields(rtxn)?; - Ok(Self::_new( + Ok(Self::new( searchable_attributes, filterable_attributes, sortable_attributes, @@ -233,7 +233,6 @@ impl MetadataBuilder { )) } - #[cfg(test)] /// Build a new `MetadataBuilder` from the given parameters. /// /// This is used for testing, prefer using `MetadataBuilder::from_index` instead. @@ -244,24 +243,6 @@ impl MetadataBuilder { localized_attributes: Option>, distinct_attribute: Option, asc_desc_attributes: HashSet, - ) -> Self { - Self::_new( - searchable_attributes, - filterable_attributes, - sortable_attributes, - localized_attributes, - distinct_attribute, - asc_desc_attributes, - ) - } - - fn _new( - searchable_attributes: Option>, - filterable_attributes: Vec, - sortable_attributes: HashSet, - localized_attributes: Option>, - distinct_attribute: Option, - asc_desc_attributes: HashSet, ) -> Self { let searchable_attributes = match searchable_attributes { Some(fields) if fields.iter().any(|f| f == "*") => None,