itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-10-02 15:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(parser): Update for anychar->any rename

Browse Source
This commit is contained in:
Ed Page 2024-07-17 13:59:51 -05:00
parent c91321e90e
commit 80cd811a82
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rinja_parser/src/lib.rs
View File

@ -12,8 +12,9 @@ use std::{fmt, str};
use winnow::Parser; use winnow::Parser;
use winnow::branch::alt; use winnow::branch::alt;
use winnow::bytes::any;
use winnow::bytes::complete::{escaped, is_not, tag, take_till, take_while_m_n, take_while1}; use winnow::bytes::complete::{escaped, is_not, tag, take_till, take_while_m_n, take_while1};
use winnow::character::complete::{anychar, one_of, satisfy}; use winnow::character::complete::{one_of, satisfy};
use winnow::combinator::{consumed, cut_err, fail, map, not, opt, recognize, value}; use winnow::combinator::{consumed, cut_err, fail, map, not, opt, recognize, value};
use winnow::error::{ErrorKind, FromExternalError}; use winnow::error::{ErrorKind, FromExternalError};
use winnow::multi::{many0, many1}; use winnow::multi::{many0, many1};
@ -297,7 +298,7 @@ fn skip_till<'a, 'b, O>(
candidate_finder: impl crate::memchr_splitter::Splitter, candidate_finder: impl crate::memchr_splitter::Splitter,
end: impl Parser<&'a str, O, ErrorContext<'a>>, end: impl Parser<&'a str, O, ErrorContext<'a>>,
) -> impl Parser<&'a str, (&'a str, O), ErrorContext<'a>> { ) -> impl Parser<&'a str, (&'a str, O), ErrorContext<'a>> {
let mut next = alt((map(end, Some), map(anychar, |_| None))); let mut next = alt((map(end, Some), map(any, |_| None)));
move |start: &'a str| { move |start: &'a str| {
let mut i = start; let mut i = start;
loop { loop {
@ -478,7 +479,7 @@ pub struct StrLit<'a> {
} }
fn str_lit_without_prefix(i: &str) -> ParseResult<'_> { fn str_lit_without_prefix(i: &str) -> ParseResult<'_> {
let (i, s) = delimited('"', opt(escaped(is_not("\\\""), '\\', anychar)), '"').parse_next(i)?; let (i, s) = delimited('"', opt(escaped(is_not("\\\""), '\\', any)), '"').parse_next(i)?;
Ok((i, s.unwrap_or_default())) Ok((i, s.unwrap_or_default()))
} }
@ -509,7 +510,7 @@ fn char_lit(i: &str) -> Result<(&str, CharLit<'_>), ParseErr<'_>> {
let start = i; let start = i;
let (i, (b_prefix, s)) = ( let (i, (b_prefix, s)) = (
opt('b'), opt('b'),
delimited('\'', opt(escaped(is_not("\\\'"), '\\', anychar)), '\''), delimited('\'', opt(escaped(is_not("\\\'"), '\\', any)), '\''),
) )
.parse_next(i)?; .parse_next(i)?;

4
rinja_parser/src/node.rs
View File

@ -2,8 +2,8 @@ use std::str;
use winnow::Parser; use winnow::Parser;
use winnow::branch::alt; use winnow::branch::alt;
use winnow::bytes::any;
use winnow::bytes::complete::{tag, take_till}; use winnow::bytes::complete::{tag, take_till};
use winnow::character::complete::anychar;
use winnow::combinator::{ use winnow::combinator::{
consumed, cut_err, eof, fail, map, map_opt, not, opt, peek, recognize, value, consumed, cut_err, eof, fail, map, map_opt, not, opt, peek, recognize, value,
}; };
@ -441,7 +441,7 @@ pub enum Whitespace {
impl Whitespace { impl Whitespace {
fn parse(i: &str) -> ParseResult<'_, Self> { fn parse(i: &str) -> ParseResult<'_, Self> {
map_opt(anychar, Self::parse_char).parse_next(i) map_opt(any, Self::parse_char).parse_next(i)
} }
fn parse_char(c: char) -> Option<Self> { fn parse_char(c: char) -> Option<Self> {