snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-30 00:55:00 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Apply code suggestions

Browse Source 
Co-authored-by: Clément Renault <clement@meilisearch.com>
This commit is contained in:
Tamo 2022-01-10 15:14:32 +01:00
parent 02a21fd309
commit 3c7ea1d298
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
filter-parser/src/value.rs
View File

@ -3,19 +3,18 @@ use nom::bytes::complete::{take_till, take_while, take_while1};
use nom::character::complete::{char, multispace0}; use nom::character::complete::{char, multispace0};
use nom::combinator::cut; use nom::combinator::cut;
use nom::sequence::{delimited, terminated}; use nom::sequence::{delimited, terminated};
use nom::{InputIter, InputLength, InputTake, Slice};
use crate::error::NomErrorExt; use crate::error::NomErrorExt;
use crate::{parse_geo_point, parse_geo_radius, Error, ErrorKind, IResult, Span, Token}; use crate::{parse_geo_point, parse_geo_radius, Error, ErrorKind, IResult, Span, Token};
/// This function goes through all chacaters in the [Span], if it finds any escaped character (`\`). /// This function goes through all characters in the [Span] if it finds any escaped character (`\`).
/// It generate a new string with all `\` removed from the [Span]. /// It generates a new string with all `\` removed from the [Span].
fn unescape(buf: Span, char_to_escape: char) -> String { fn unescape(buf: Span, char_to_escape: char) -> String {
let to_escape = format!("\\{}", char_to_escape); let to_escape = format!("\\{}", char_to_escape);
buf.replace(&to_escape, &char_to_escape.to_string()) buf.replace(&to_escape, &char_to_escape.to_string())
} }
use nom::{InputIter, InputLength, InputTake, Slice};
/// Parse a value in quote. If it encounter an escaped quote it'll unescape it. /// Parse a value in quote. If it encounter an escaped quote it'll unescape it.
fn quoted_by(quote: char, input: Span) -> IResult<Token> { fn quoted_by(quote: char, input: Span) -> IResult<Token> {
// empty fields / values are valid in json // empty fields / values are valid in json
@ -98,7 +97,6 @@ pub fn parse_value<'a>(input: Span<'a>) -> IResult<Token<'a>> {
)), )),
multispace0, multispace0,
)(input) )(input)
// .map(|(s, t)| (s, t.into()))
// if we found nothing in the alt it means the user specified something that was not recognized as a value // if we found nothing in the alt it means the user specified something that was not recognized as a value
.map_err(|e: nom::Err<Error>| { .map_err(|e: nom::Err<Error>| {
e.map_err(|_| Error::new_from_kind(error_word(input).unwrap().1, ErrorKind::ExpectedValue)) e.map_err(|_| Error::new_from_kind(error_word(input).unwrap().1, ErrorKind::ExpectedValue))