From 2c65781d91e23c4ea3ca702472f4bdcd998d884c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=80=9A=E9=AA=8B?= Date: Tue, 12 Oct 2021 22:19:28 +0800 Subject: [PATCH] format --- milli/src/search/facet/filter_condition.rs | 5 +---- milli/src/search/facet/filter_parser.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/milli/src/search/facet/filter_condition.rs b/milli/src/search/facet/filter_condition.rs index 96c8867ec..2686e4a4b 100644 --- a/milli/src/search/facet/filter_condition.rs +++ b/milli/src/search/facet/filter_condition.rs @@ -1,4 +1,3 @@ - use std::fmt::Debug; use std::ops::Bound::{self, Excluded, Included}; @@ -16,9 +15,7 @@ use crate::error::{Error, UserError}; use crate::heed_codec::facet::{ FacetLevelValueF64Codec, FacetStringLevelZeroCodec, FacetStringLevelZeroValueCodec, }; -use crate::{ - distance_between_two_points, CboRoaringBitmapCodec, FieldId, Index, Result, -}; +use crate::{distance_between_two_points, CboRoaringBitmapCodec, FieldId, Index, Result}; #[derive(Debug, Clone, PartialEq)] pub enum FilterCondition { diff --git a/milli/src/search/facet/filter_parser.rs b/milli/src/search/facet/filter_parser.rs index 8d00d086c..01e944a98 100644 --- a/milli/src/search/facet/filter_parser.rs +++ b/milli/src/search/facet/filter_parser.rs @@ -215,8 +215,7 @@ impl<'a> ParseContext<'a> { where E: ParseError<&'a str> + ContextError<&'a str> + Debug, { - let err_msg_args_incomplete:&'static str = - "_geoRadius. The `_geoRadius` filter expect three arguments: `_geoRadius(latitude, longitude, radius)`"; + let err_msg_args_incomplete:&'static str = "_geoRadius. The `_geoRadius` filter expect three arguments: `_geoRadius(latitude, longitude, radius)`"; let err_msg_args_invalid: &'static str = "_geoRadius. Latitude and longitude must be contained between -180 to 180 degrees."; let (input, args): (&str, Vec<&str>) = match preceded( @@ -256,7 +255,7 @@ impl<'a> ParseContext<'a> { .or((!(-181.0..181.).contains(&lng)).then(|| &lng)) { let e = E::from_char(input, '('); - return Err(nom::Err::Failure(E::add_context(input,err_msg_args_invalid, e))); + return Err(nom::Err::Failure(E::add_context(input, err_msg_args_invalid, e))); } let res = FilterCondition::Operator(fid, GeoLowerThan([lat, lng], dis)); @@ -270,7 +269,7 @@ impl<'a> ParseContext<'a> { let l1 = |c| self.parse_simple_condition(c); let l2 = |c| self.parse_range_condition(c); let l3 = |c| self.parse_geo_radius(c); - let (input, condition) = alt((l1, l2,l3))(input)?; + let (input, condition) = alt((l1, l2, l3))(input)?; Ok((input, condition)) } @@ -395,7 +394,7 @@ mod tests { let mut wtxn = index.write_txn().unwrap(); let mut builder = Settings::new(&mut wtxn, &index, 0); - builder.set_searchable_fields(vec![S("channel"), S("timestamp"),S("id")]); // to keep the fields order + builder.set_searchable_fields(vec![S("channel"), S("timestamp"), S("id")]); // to keep the fields order builder.set_filterable_fields(hashset! { S("channel"), S("timestamp") ,S("id")}); builder.execute(|_, _| ()).unwrap(); wtxn.commit().unwrap(); @@ -530,7 +529,8 @@ mod tests { &rtxn, &index, "(NOT _geoRadius(1, 2, 300) AND _geoRadius(1.001, 2.002, 1000.300)) OR price <= 10", - ).unwrap(); + ) + .unwrap(); let expected = FilterCondition::Or( Box::new(FilterCondition::And( Box::new(FilterCondition::Operator(0, GeoGreaterThan([1., 2.], 300.))),