diff --git a/milli/src/asc_desc.rs b/milli/src/asc_desc.rs index d68d5b6a2..9a3bda934 100644 --- a/milli/src/asc_desc.rs +++ b/milli/src/asc_desc.rs @@ -1,4 +1,4 @@ -//! This module provide the `AscDesc` type and define a all the errors related to this type +//! This module provides the `AscDesc` type and defines all the errors related to this type. use std::fmt; use std::str::FromStr; @@ -43,7 +43,7 @@ impl From for CriterionError { AscDescError::ReservedKeyword { name } if name.starts_with("_geoRadius") => { CriterionError::ReservedNameForFilter { name: "_geoRadius".to_string() } } - AscDescError::ReservedKeyword { name } => (CriterionError::ReservedName { name }), + AscDescError::ReservedKeyword { name } => CriterionError::ReservedName { name }, } } } @@ -129,7 +129,7 @@ impl FromStr for AscDesc { type Err = AscDescError; /// Since we don't know if this was deserialized for a criterion or a sort we just return a - /// string and let the caller create his own error + /// string and let the caller create his own error. fn from_str(text: &str) -> Result { match text.rsplit_once(':') { Some((left, "asc")) => Ok(AscDesc::Asc(left.parse()?)), diff --git a/milli/src/criterion.rs b/milli/src/criterion.rs index 4299e4974..aff7fcf68 100644 --- a/milli/src/criterion.rs +++ b/milli/src/criterion.rs @@ -24,17 +24,17 @@ impl fmt::Display for CriterionError { Self::ReservedNameForSort { name } => { write!( f, - "{0} is a reserved keyword and thus can't be used as a ranking rule. \ -{0} can only be used for sorting at search time", - name + "{} is a reserved keyword and thus can't be used as a ranking rule. \ +{} can only be used for sorting at search time", + name, name ) } Self::ReservedNameForFilter { name } => { write!( f, - "{0} is a reserved keyword and thus can't be used as a ranking rule. \ -{0} can only be used for filtering at search time", - name + "{} is a reserved keyword and thus can't be used as a ranking rule. \ +{} can only be used for filtering at search time", + name, name ) } } diff --git a/milli/src/error.rs b/milli/src/error.rs index 519de8516..bd4f02b99 100644 --- a/milli/src/error.rs +++ b/milli/src/error.rs @@ -210,7 +210,7 @@ impl fmt::Display for UserError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { Self::AttributeLimitReached => f.write_str("maximum number of attributes reached"), - Self::CriterionError(error) => f.write_str(&error.to_string()), + Self::CriterionError(error) => write!(f, "{}", error), Self::DocumentLimitReached => f.write_str("maximum number of documents reached"), Self::InvalidFacetsDistribution { invalid_facets_name } => { let name_list =