From 6ae9f0c3599ec72ff2ad2f1db086bb45475edd82 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 17 Jul 2024 14:06:36 -0500 Subject: [PATCH] refactor(parser): Update for dropping complete/streaming mod's --- rinja_parser/src/expr.rs | 2 +- rinja_parser/src/lib.rs | 5 ++--- rinja_parser/src/node.rs | 3 +-- rinja_parser/src/target.rs | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rinja_parser/src/expr.rs b/rinja_parser/src/expr.rs index 1ed2781c..e7112cc8 100644 --- a/rinja_parser/src/expr.rs +++ b/rinja_parser/src/expr.rs @@ -4,7 +4,7 @@ use std::str; use winnow::Parser; use winnow::branch::alt; use winnow::bytes::take_till0; -use winnow::character::complete::digit1; +use winnow::character::digit1; use winnow::combinator::{consumed, cut_err, fail, map, not, opt, peek, recognize, value}; use winnow::error::{ErrorKind, ParseError as _}; use winnow::multi::{fold_many0, many0, separated0, separated1}; diff --git a/rinja_parser/src/lib.rs b/rinja_parser/src/lib.rs index 0ca8dbe2..d4ecc875 100644 --- a/rinja_parser/src/lib.rs +++ b/rinja_parser/src/lib.rs @@ -12,9 +12,8 @@ use std::{fmt, str}; use winnow::Parser; use winnow::branch::alt; -use winnow::bytes::complete::{escaped, tag, take_while_m_n, take_while1}; -use winnow::bytes::{any, take_till0, take_till1}; -use winnow::character::complete::one_of; +use winnow::bytes::{any, one_of, tag, take_till0, take_till1, take_while_m_n, take_while1}; +use winnow::character::escaped; use winnow::combinator::{consumed, cut_err, fail, map, not, opt, recognize, value}; use winnow::error::{ErrorKind, FromExternalError}; use winnow::multi::{many0, many1}; diff --git a/rinja_parser/src/node.rs b/rinja_parser/src/node.rs index 4eda2f0d..943ea7aa 100644 --- a/rinja_parser/src/node.rs +++ b/rinja_parser/src/node.rs @@ -2,8 +2,7 @@ use std::str; use winnow::Parser; use winnow::branch::alt; -use winnow::bytes::complete::tag; -use winnow::bytes::{any, take_till0}; +use winnow::bytes::{any, tag, take_till0}; use winnow::combinator::{ consumed, cut_err, eof, fail, map, map_opt, not, opt, peek, recognize, value, }; diff --git a/rinja_parser/src/target.rs b/rinja_parser/src/target.rs index 2ae6a21d..03303b94 100644 --- a/rinja_parser/src/target.rs +++ b/rinja_parser/src/target.rs @@ -1,6 +1,6 @@ use winnow::Parser; use winnow::branch::alt; -use winnow::character::complete::one_of; +use winnow::bytes::one_of; use winnow::combinator::{consumed, map, map_res, opt}; use winnow::multi::separated1; use winnow::sequence::preceded;