actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-11-22 00:51:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Resolve deprecations

Browse source
This commit is contained in:
Ed Page 2023-04-27 23:26:55 -05:00
parent d17ca898d9
commit 808e862bfb
1 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
crates/typos/src/tokens.rs
View file

@ -125,16 +125,14 @@ impl<'s> Iterator for Utf8Chunks<'s> {
} }
mod parser { mod parser {
use winnow::branch::*;
use winnow::bytes::*;
use winnow::combinator::*; use winnow::combinator::*;
use winnow::prelude::*; use winnow::prelude::*;
use winnow::sequence::*;
use winnow::stream::AsBStr; use winnow::stream::AsBStr;
use winnow::stream::AsChar; use winnow::stream::AsChar;
use winnow::stream::SliceLen; use winnow::stream::SliceLen;
use winnow::stream::Stream; use winnow::stream::Stream;
use winnow::stream::StreamIsPartial; use winnow::stream::StreamIsPartial;
use winnow::token::*;
pub(crate) fn next_identifier<T>(input: T) -> IResult<T, <T as Stream>::Slice> pub(crate) fn next_identifier<T>(input: T) -> IResult<T, <T as Stream>::Slice>
where where
@ -257,8 +255,8 @@ mod parser {
preceded( preceded(
'#', '#',
alt(( alt((
terminated(take_while_m_n(3, 8, is_lower_hex_digit), peek(sep1)), terminated(take_while(3..=8, is_lower_hex_digit), peek(sep1)),
terminated(take_while_m_n(3, 8, is_upper_hex_digit), peek(sep1)), terminated(take_while(3..=8, is_upper_hex_digit), peek(sep1)),
)), )),
) )
.parse_next(input) .parse_next(input)
@ -272,26 +270,26 @@ mod parser {
{ {
alt(( alt((
( (
take_while_m_n(8, 8, is_lower_hex_digit), take_while(8, is_lower_hex_digit),
'-', '-',
take_while_m_n(4, 4, is_lower_hex_digit), take_while(4, is_lower_hex_digit),
'-', '-',
take_while_m_n(4, 4, is_lower_hex_digit), take_while(4, is_lower_hex_digit),
'-', '-',
take_while_m_n(4, 4, is_lower_hex_digit), take_while(4, is_lower_hex_digit),
'-', '-',
take_while_m_n(12, 12, is_lower_hex_digit), take_while(12, is_lower_hex_digit),
), ),
( (
take_while_m_n(8, 8, is_upper_hex_digit), take_while(8, is_upper_hex_digit),
'-', '-',
take_while_m_n(4, 4, is_upper_hex_digit), take_while(4, is_upper_hex_digit),
'-', '-',
take_while_m_n(4, 4, is_upper_hex_digit), take_while(4, is_upper_hex_digit),
'-', '-',
take_while_m_n(4, 4, is_upper_hex_digit), take_while(4, is_upper_hex_digit),
'-', '-',
take_while_m_n(12, 12, is_upper_hex_digit), take_while(12, is_upper_hex_digit),
), ),
)) ))
.recognize() .recognize()
@ -314,10 +312,9 @@ mod parser {
// or more. // or more.
const IGNORE_HEX_MIN: usize = 32; const IGNORE_HEX_MIN: usize = 32;
const IGNORE_HEX_MAX: usize = usize::MAX;
alt(( alt((
take_while_m_n(IGNORE_HEX_MIN, IGNORE_HEX_MAX, is_lower_hex_digit), take_while(IGNORE_HEX_MIN.., is_lower_hex_digit),
take_while_m_n(IGNORE_HEX_MIN, IGNORE_HEX_MAX, is_upper_hex_digit), take_while(IGNORE_HEX_MIN.., is_upper_hex_digit),
)) ))
.parse_next(input) .parse_next(input)
} }
@ -350,7 +347,7 @@ mod parser {
} }
let (after, _) = let (after, _) =
take_while_m_n(padding_len, padding_len, is_base64_padding).parse_next(padding)?; take_while(padding_len..=padding_len, is_base64_padding).parse_next(padding)?;
let after_offset = input.offset_to(&after); let after_offset = input.offset_to(&after);
Ok(input.next_slice(after_offset)) Ok(input.next_slice(after_offset))
@ -439,12 +436,7 @@ mod parser {
F: winnow::Parser<I, <I as Stream>::Slice, E>, F: winnow::Parser<I, <I as Stream>::Slice, E>,
E: winnow::error::ParseError<I>, E: winnow::error::ParseError<I>,
{ {
move |i: I| { move |i: I| repeat0(f.by_ref()).map(|()| ()).recognize().parse_next(i)
winnow::multi::many0(f.by_ref())
.map(|()| ())
.recognize()
.parse_next(i)
}
} }
#[inline] #[inline]