actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2025-02-13 16:50:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

refactor: Resolve deprecations

Browse source
This commit is contained in:
Ed Page 2025-01-30 13:55:32 -06:00
parent 07f1292e29
commit 7830eb8730
2 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,7 +145,7 @@ mod parser {
/// later may cause it to fail. /// later may cause it to fail.
const NON_TERMINATING_CAP: usize = 1024; const NON_TERMINATING_CAP: usize = 1024;
pub(crate) fn next_identifier<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> pub(crate) fn next_identifier<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -155,7 +155,7 @@ mod parser {
preceded(ignore, identifier).parse_next(input) preceded(ignore, identifier).parse_next(input)
} }
fn identifier<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn identifier<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
<T as Stream>::Slice: AsBStr + SliceLen + Default, <T as Stream>::Slice: AsBStr + SliceLen + Default,
@ -173,7 +173,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn ignore<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn ignore<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -204,7 +204,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn sep1<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn sep1<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
<T as Stream>::Slice: AsBStr + SliceLen + Default, <T as Stream>::Slice: AsBStr + SliceLen + Default,
@ -217,7 +217,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn other<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn other<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
<T as Stream>::Slice: AsBStr + SliceLen + Default, <T as Stream>::Slice: AsBStr + SliceLen + Default,
@ -234,7 +234,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn ordinal_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn ordinal_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -260,7 +260,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn dec_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn dec_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
<T as Stream>::Slice: AsBStr + SliceLen + Default, <T as Stream>::Slice: AsBStr + SliceLen + Default,
@ -269,7 +269,7 @@ mod parser {
trace("dec_literal", take_while(1.., is_dec_digit_with_sep)).parse_next(input) trace("dec_literal", take_while(1.., is_dec_digit_with_sep)).parse_next(input)
} }
fn hex_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn hex_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -281,7 +281,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn css_color<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn css_color<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -302,7 +302,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn jwt<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn jwt<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -337,7 +337,7 @@ mod parser {
|| c == '-' || c == '-'
} }
fn uuid_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn uuid_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -375,7 +375,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn hash_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn hash_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
<T as Stream>::Slice: AsBStr + SliceLen + Default, <T as Stream>::Slice: AsBStr + SliceLen + Default,
@ -401,7 +401,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn base64_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn base64_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
<T as Stream>::Slice: AsBStr + SliceLen + Default, <T as Stream>::Slice: AsBStr + SliceLen + Default,
@ -425,10 +425,7 @@ mod parser {
.iter() .iter()
.all(|c| !['/', '+'].contains(&c.as_char())) .all(|c| !['/', '+'].contains(&c.as_char()))
{ {
return Err(winnow::error::ErrMode::from_error_kind( return Err(winnow::error::ErrMode::from_input(input));
input,
winnow::error::ErrorKind::Slice,
));
} }
take_while(padding_len..=padding_len, is_base64_padding).parse_next(input)?; take_while(padding_len..=padding_len, is_base64_padding).parse_next(input)?;
@ -440,7 +437,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn email_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn email_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -459,7 +456,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn url_literal<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn url_literal<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -492,7 +489,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn url_userinfo<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn url_userinfo<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
@ -510,7 +507,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn c_escape<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn c_escape<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,
<T as Stream>::Slice: AsBStr + SliceLen + Default, <T as Stream>::Slice: AsBStr + SliceLen + Default,
@ -531,7 +528,7 @@ mod parser {
.parse_next(input) .parse_next(input)
} }
fn printf<T>(input: &mut T) -> PResult<<T as Stream>::Slice, ()> fn printf<T>(input: &mut T) -> ModalResult<<T as Stream>::Slice, ()>
where where
T: Compare<char>, T: Compare<char>,
T: Stream + StreamIsPartial + PartialEq, T: Stream + StreamIsPartial + PartialEq,

24
crates/varcon-core/src/parser.rs
View file

@ -546,7 +546,7 @@ impl Cluster {
Self::parse_.parse(input).map_err(|_err| ParseError) Self::parse_.parse(input).map_err(|_err| ParseError)
} }
fn parse_(input: &mut &str) -> PResult<Self, ()> { fn parse_(input: &mut &str) -> ModalResult<Self, ()> {
trace("cluster", move |input: &mut &str| { trace("cluster", move |input: &mut &str| {
let header = ( let header = (
"#", "#",
@ -966,7 +966,7 @@ impl Entry {
Self::parse_.parse(input).map_err(|_err| ParseError) Self::parse_.parse(input).map_err(|_err| ParseError)
} }
fn parse_(input: &mut &str) -> PResult<Self, ()> { fn parse_(input: &mut &str) -> ModalResult<Self, ()> {
trace("entry", move |input: &mut &str| { trace("entry", move |input: &mut &str| {
let var_sep = (winnow::ascii::space0, '/', winnow::ascii::space0); let var_sep = (winnow::ascii::space0, '/', winnow::ascii::space0);
let variants = let variants =
@ -987,7 +987,7 @@ impl Entry {
.parse_next(input) .parse_next(input)
} }
fn parse_description(input: &mut &str) -> PResult<Self, ()> { fn parse_description(input: &mut &str) -> ModalResult<Self, ()> {
trace("description", move |input: &mut &str| { trace("description", move |input: &mut &str| {
let mut entry = Self { let mut entry = Self {
variants: Vec::new(), variants: Vec::new(),
@ -1023,18 +1023,18 @@ impl Entry {
} }
} }
fn note(input: &mut &str) -> PResult<String, ()> { fn note(input: &mut &str) -> ModalResult<String, ()> {
let (_, _, note) = (NOTE_PREFIX, space1, description).parse_next(input)?; let (_, _, note) = (NOTE_PREFIX, space1, description).parse_next(input)?;
Ok(note) Ok(note)
} }
const NOTE_PREFIX: &str = "--"; const NOTE_PREFIX: &str = "--";
fn archaic(input: &mut &str) -> PResult<(), ()> { fn archaic(input: &mut &str) -> ModalResult<(), ()> {
"(-)".void().parse_next(input) "(-)".void().parse_next(input)
} }
fn description(input: &mut &str) -> PResult<String, ()> { fn description(input: &mut &str) -> ModalResult<String, ()> {
let description = winnow::token::take_till(0.., ('\n', '\r', '#', '|')).parse_next(input)?; let description = winnow::token::take_till(0.., ('\n', '\r', '#', '|')).parse_next(input)?;
Ok(description.to_owned()) Ok(description.to_owned())
} }
@ -1573,7 +1573,7 @@ impl Variant {
Self::parse_.parse(input).map_err(|_err| ParseError) Self::parse_.parse(input).map_err(|_err| ParseError)
} }
fn parse_(input: &mut &str) -> PResult<Self, ()> { fn parse_(input: &mut &str) -> ModalResult<Self, ()> {
trace("variant", move |input: &mut &str| { trace("variant", move |input: &mut &str| {
let types = winnow::combinator::separated(1.., Type::parse_, space1); let types = winnow::combinator::separated(1.., Type::parse_, space1);
let columns = let columns =
@ -1592,7 +1592,7 @@ impl Variant {
} }
} }
fn word(input: &mut &str) -> PResult<String, ()> { fn word(input: &mut &str) -> ModalResult<String, ()> {
trace("word", move |input: &mut &str| { trace("word", move |input: &mut &str| {
winnow::token::take_till(1.., |item: char| item.is_ascii_whitespace()) winnow::token::take_till(1.., |item: char| item.is_ascii_whitespace())
.map(|s: &str| s.to_owned().replace('_', " ")) .map(|s: &str| s.to_owned().replace('_', " "))
@ -1734,7 +1734,7 @@ impl Type {
Self::parse_.parse(input).map_err(|_err| ParseError) Self::parse_.parse(input).map_err(|_err| ParseError)
} }
fn parse_(input: &mut &str) -> PResult<Type, ()> { fn parse_(input: &mut &str) -> ModalResult<Type, ()> {
trace("type", move |input: &mut &str| { trace("type", move |input: &mut &str| {
let category = Category::parse_(input)?; let category = Category::parse_(input)?;
let tag = opt(Tag::parse_).parse_next(input)?; let tag = opt(Tag::parse_).parse_next(input)?;
@ -1850,7 +1850,7 @@ impl Category {
Self::parse_.parse(input).map_err(|_err| ParseError) Self::parse_.parse(input).map_err(|_err| ParseError)
} }
fn parse_(input: &mut &str) -> PResult<Self, ()> { fn parse_(input: &mut &str) -> ModalResult<Self, ()> {
trace("category", move |input: &mut &str| { trace("category", move |input: &mut &str| {
let symbols = one_of(['A', 'B', 'Z', 'C', 'D', '_']); let symbols = one_of(['A', 'B', 'Z', 'C', 'D', '_']);
symbols symbols
@ -1909,7 +1909,7 @@ impl Tag {
Self::parse_.parse(input).map_err(|_err| ParseError) Self::parse_.parse(input).map_err(|_err| ParseError)
} }
fn parse_(input: &mut &str) -> PResult<Self, ()> { fn parse_(input: &mut &str) -> ModalResult<Self, ()> {
trace("tag", move |input: &mut &str| { trace("tag", move |input: &mut &str| {
let symbols = one_of(['.', 'v', 'V', '-', 'x']); let symbols = one_of(['.', 'v', 'V', '-', 'x']);
symbols symbols
@ -1967,7 +1967,7 @@ impl Pos {
Self::parse_.parse(input).map_err(|_err| ParseError) Self::parse_.parse(input).map_err(|_err| ParseError)
} }
fn parse_(input: &mut &str) -> PResult<Self, ()> { fn parse_(input: &mut &str) -> ModalResult<Self, ()> {
trace("pos", move |input: &mut &str| { trace("pos", move |input: &mut &str| {
alt(( alt((
"N".value(Pos::Noun), "N".value(Pos::Noun),