From e2d55e13d33c7e4bf4f6252ef369ca7ac3406329 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 16 Oct 2023 19:43:15 -0400 Subject: [PATCH] Fix some clippy errors that didn't appear on my host version of clippy. --- src/parser/latex_environment.rs | 11 +++-------- src/parser/line_break.rs | 2 +- src/parser/subscript_and_superscript.rs | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/parser/latex_environment.rs b/src/parser/latex_environment.rs index 11ccde2..6503a66 100644 --- a/src/parser/latex_environment.rs +++ b/src/parser/latex_environment.rs @@ -43,13 +43,8 @@ where let value_start = remaining; start_of_line(remaining)?; let (remaining, _leading_whitespace) = space0(remaining)?; - let (remaining, (_opening, name, _open_close_brace, _ws, _line_ending)) = tuple(( - tag_no_case(r#"\begin{"#), - name, - tag("}"), - space0, - line_ending, - ))(remaining)?; + let (remaining, (_opening, name, _open_close_brace, _ws, _line_ending)) = + tuple((tag_no_case(r"\begin{"), name, tag("}"), space0, line_ending))(remaining)?; let latex_environment_end_specialized = latex_environment_end(name.into()); let parser_context = ContextElement::ExitMatcherNode(ExitMatcherNode { @@ -127,7 +122,7 @@ fn _latex_environment_end<'b, 'g, 'r, 's, 'c>( start_of_line(input)?; let (remaining, _leading_whitespace) = space0(input)?; let (remaining, (_begin, _name, _close_brace, _ws, _line_ending)) = tuple(( - tag_no_case(r#"\end{"#), + tag_no_case(r"\end{"), tag_no_case(current_name_lower), tag("}"), space0, diff --git a/src/parser/line_break.rs b/src/parser/line_break.rs index 1d460f3..fef8940 100644 --- a/src/parser/line_break.rs +++ b/src/parser/line_break.rs @@ -21,7 +21,7 @@ pub(crate) fn line_break<'b, 'g, 'r, 's>( input: OrgSource<'s>, ) -> Res, LineBreak<'s>> { let (remaining, _) = pre(context, input)?; - let (remaining, _) = tag(r#"\\"#)(remaining)?; + let (remaining, _) = tag(r"\\")(remaining)?; let (remaining, _) = recognize(many0(one_of(" \t")))(remaining)?; let (remaining, _) = line_ending(remaining)?; let source = get_consumed(input, remaining); diff --git a/src/parser/subscript_and_superscript.rs b/src/parser/subscript_and_superscript.rs index 64ebc7f..0851ea7 100644 --- a/src/parser/subscript_and_superscript.rs +++ b/src/parser/subscript_and_superscript.rs @@ -175,7 +175,7 @@ fn script_alphanum<'b, 'g, 'r, 's>( #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))] fn script_alphanum_character<'s>(input: OrgSource<'s>) -> Res, OrgSource<'s>> { recognize(verify(anychar, |c| { - c.is_alphanumeric() || r#",.\"#.contains(*c) + c.is_alphanumeric() || r",.\".contains(*c) }))(input) } @@ -183,7 +183,7 @@ fn script_alphanum_character<'s>(input: OrgSource<'s>) -> Res, Org fn end_script_alphanum_character<'s>(input: OrgSource<'s>) -> Res, OrgSource<'s>> { let (remaining, final_char) = recognize(verify(anychar, |c| c.is_alphanumeric()))(input)?; peek(tuple(( - take_while(|c| r#",.\"#.contains(c)), + take_while(|c| r",.\".contains(c)), not(script_alphanum_character), )))(remaining)?; Ok((remaining, final_char))