snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-26 16:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

create an asc_desc error type that is never supposed to be returned to the end user

Browse Source
This commit is contained in:
Tamo
2021-09-22 15:33:32 +02:00
parent 257e621d40
commit 86e272856a
3 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
milli/src/criterion.rs
View File

@ -4,7 +4,7 @@ use std::str::FromStr;
use serde::{Deserialize, Serialize};
use crate::error::{Error, UserError};
use crate::{AscDesc, Member};
use crate::{AscDesc, AscDescError, Member};
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
pub enum Criterion {
@ -58,31 +58,24 @@ impl FromStr for Criterion {
name: "_geoPoint".to_string(),
})?
}
Err(UserError::InvalidAscDescSyntax { name }) => {
Err(AscDescError::InvalidSyntax { name }) => {
Err(UserError::InvalidRankingRuleName { name })?
}
Err(UserError::InvalidReservedAscDescSyntax { name })
if name.starts_with("_geoPoint") =>
{
Err(AscDescError::ReservedKeyword { name }) if name.starts_with("_geoPoint") => {
Err(UserError::InvalidReservedRankingRuleNameSort {
name: "_geoPoint".to_string(),
}
.into())
}
Err(UserError::InvalidReservedAscDescSyntax { name })
if name.starts_with("_geoRadius") =>
{
Err(AscDescError::ReservedKeyword { name }) if name.starts_with("_geoRadius") => {
Err(UserError::InvalidReservedRankingRuleNameFilter {
name: "_geoRadius".to_string(),
}
.into())
}
Err(UserError::InvalidReservedAscDescSyntax { name }) => {
Err(AscDescError::ReservedKeyword { name }) => {
Err(UserError::InvalidReservedRankingRuleName { name }.into())
}
Err(error) => {
Err(UserError::InvalidRankingRuleName { name: error.to_string() }.into())
}
},
}
}