From 3c7ea1d298ca8dac991da7f006b9a4bf2a25f9d1 Mon Sep 17 00:00:00 2001 From: Tamo Date: Mon, 10 Jan 2022 15:14:32 +0100 Subject: [PATCH] Apply code suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Clément Renault --- filter-parser/src/value.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/filter-parser/src/value.rs b/filter-parser/src/value.rs index d2ca1c932..ec7c93656 100644 --- a/filter-parser/src/value.rs +++ b/filter-parser/src/value.rs @@ -3,19 +3,18 @@ use nom::bytes::complete::{take_till, take_while, take_while1}; use nom::character::complete::{char, multispace0}; use nom::combinator::cut; use nom::sequence::{delimited, terminated}; +use nom::{InputIter, InputLength, InputTake, Slice}; use crate::error::NomErrorExt; 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 (`\`). -/// It generate a new string with all `\` removed from the [Span]. +/// This function goes through all characters in the [Span] if it finds any escaped character (`\`). +/// It generates a new string with all `\` removed from the [Span]. fn unescape(buf: Span, char_to_escape: char) -> String { let to_escape = format!("\\{}", char_to_escape); 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. fn quoted_by(quote: char, input: Span) -> IResult { // empty fields / values are valid in json @@ -98,7 +97,6 @@ pub fn parse_value<'a>(input: Span<'a>) -> IResult> { )), multispace0, )(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 .map_err(|e: nom::Err| { e.map_err(|_| Error::new_from_kind(error_word(input).unwrap().1, ErrorKind::ExpectedValue))