From 913823a33639514182d0d73b91808665222e4acb Mon Sep 17 00:00:00 2001 From: DaniPopes <57450786+DaniPopes@users.noreply.github.com> Date: Tue, 28 Jan 2025 17:40:39 +0100 Subject: [PATCH] chore: clippy --- Cargo.toml | 2 +- crates/dyn-abi/src/coerce.rs | 22 +++++++++++----------- crates/sol-type-parser/src/ident.rs | 6 +++--- crates/sol-type-parser/src/parameter.rs | 6 +++--- crates/sol-type-parser/src/root.rs | 4 ++-- crates/sol-type-parser/src/stem.rs | 4 ++-- crates/sol-type-parser/src/tuple.rs | 6 +++--- crates/sol-type-parser/src/type_spec.rs | 6 +++--- crates/sol-type-parser/src/utils.rs | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3f89f8347..f20e7940e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ manual-string-new = "warn" uninlined-format-args = "warn" use-self = "warn" redundant-clone = "warn" -missing-const-for-fn = "warn" +missing-const-for-fn = "allow" # TODO: https://github.com/rust-lang/rust-clippy/issues/14020 [workspace.lints.rust] missing-copy-implementations = "warn" diff --git a/crates/dyn-abi/src/coerce.rs b/crates/dyn-abi/src/coerce.rs index d6cd11a6e..395fcafae 100644 --- a/crates/dyn-abi/src/coerce.rs +++ b/crates/dyn-abi/src/coerce.rs @@ -18,7 +18,7 @@ use winnow::{ }, stream::Stream, token::take_while, - PResult, Parser, + ModalResult, Parser, }; impl DynSolType { @@ -90,7 +90,7 @@ struct ValueParser<'a> { } impl<'i> Parser, DynSolValue, ContextError> for ValueParser<'_> { - fn parse_next(&mut self, input: &mut Input<'i>) -> PResult { + fn parse_next(&mut self, input: &mut Input<'i>) -> ModalResult { #[cfg(feature = "debug")] let name = self.ty.sol_type_name(); #[cfg(not(feature = "debug"))] @@ -282,7 +282,7 @@ impl fmt::Display for Error { } #[inline] -fn bool(input: &mut Input<'_>) -> PResult { +fn bool(input: &mut Input<'_>) -> ModalResult { trace( "bool", dispatch! {alpha1.context(StrContext::Label("boolean")); @@ -313,7 +313,7 @@ fn int<'i>(size: usize) -> impl Parser, I256, ContextError> { } #[inline] -fn int_sign(input: &mut Input<'_>) -> PResult { +fn int_sign(input: &mut Input<'_>) -> ModalResult { trace("int_sign", |input: &mut Input<'_>| match input.as_bytes().first() { Some(b'+') => { let _ = input.next_slice(1); @@ -413,7 +413,7 @@ fn uint<'i>(len: usize) -> impl Parser, U256, ContextError> { } #[inline] -fn prefixed_int<'i>(input: &mut Input<'i>) -> PResult<&'i str> { +fn prefixed_int<'i>(input: &mut Input<'i>) -> ModalResult<&'i str> { trace( "prefixed_int", spanned(|input: &mut Input<'i>| { @@ -441,7 +441,7 @@ fn prefixed_int<'i>(input: &mut Input<'i>) -> PResult<&'i str> { } #[inline] -fn int_units(input: &mut Input<'_>) -> PResult { +fn int_units(input: &mut Input<'_>) -> ModalResult { trace( "int_units", dispatch! {alpha0; @@ -455,7 +455,7 @@ fn int_units(input: &mut Input<'_>) -> PResult { } #[inline] -fn scientific_notation(input: &mut Input<'_>) -> PResult { +fn scientific_notation(input: &mut Input<'_>) -> ModalResult { // Check if we have 'e' or 'E' followed by an optional sign and digits if !matches!(input.chars().next(), Some('e' | 'E')) { return Err(ErrMode::from_error_kind(input, ErrorKind::Fail)); @@ -490,22 +490,22 @@ fn fixed_bytes<'i>(len: usize) -> impl Parser, Word, ContextError> { } #[inline] -fn address(input: &mut Input<'_>) -> PResult
{ +fn address(input: &mut Input<'_>) -> ModalResult
{ trace("address", hex_str.try_map(hex::FromHex::from_hex)).parse_next(input) } #[inline] -fn function(input: &mut Input<'_>) -> PResult { +fn function(input: &mut Input<'_>) -> ModalResult { trace("function", hex_str.try_map(hex::FromHex::from_hex)).parse_next(input) } #[inline] -fn bytes(input: &mut Input<'_>) -> PResult> { +fn bytes(input: &mut Input<'_>) -> ModalResult> { trace("bytes", hex_str.try_map(hex::decode)).parse_next(input) } #[inline] -fn hex_str<'i>(input: &mut Input<'i>) -> PResult<&'i str> { +fn hex_str<'i>(input: &mut Input<'i>) -> ModalResult<&'i str> { trace("hex_str", |input: &mut Input<'i>| { // Allow empty `bytes` only with a prefix. let has_prefix = opt("0x").parse_next(input)?.is_some(); diff --git a/crates/sol-type-parser/src/ident.rs b/crates/sol-type-parser/src/ident.rs index 78fb860a4..3c584a3de 100644 --- a/crates/sol-type-parser/src/ident.rs +++ b/crates/sol-type-parser/src/ident.rs @@ -1,7 +1,7 @@ use winnow::{ error::{ErrMode, ErrorKind, ParserError}, stream::{AsBStr, Stream}, - PResult, + ModalResult, }; /// The regular expression for a Solidity identifier. @@ -54,12 +54,12 @@ pub const fn is_valid_identifier(s: &str) -> bool { /// Parses a Solidity identifier. #[inline] -pub fn identifier<'a>(input: &mut &'a str) -> PResult<&'a str> { +pub fn identifier<'a>(input: &mut &'a str) -> ModalResult<&'a str> { identifier_parser(input) } #[inline] -pub(crate) fn identifier_parser<'a, I>(input: &mut I) -> PResult<&'a str> +pub(crate) fn identifier_parser<'a, I>(input: &mut I) -> ModalResult<&'a str> where I: Stream + AsBStr, { diff --git a/crates/sol-type-parser/src/parameter.rs b/crates/sol-type-parser/src/parameter.rs index 257f80824..2e3751d76 100644 --- a/crates/sol-type-parser/src/parameter.rs +++ b/crates/sol-type-parser/src/parameter.rs @@ -5,7 +5,7 @@ use crate::{ }; use alloc::vec::Vec; use core::fmt; -use winnow::{combinator::trace, PResult, Parser}; +use winnow::{combinator::trace, ModalResult, Parser}; // TODO: Parse visibility and state mutability @@ -41,7 +41,7 @@ impl<'a> ParameterSpecifier<'a> { } /// [`winnow`] parser for this type. - pub(crate) fn parser(input: &mut Input<'a>) -> PResult { + pub(crate) fn parser(input: &mut Input<'a>) -> ModalResult { trace( "ParameterSpecifier", spanned(|input: &mut Input<'a>| { @@ -104,7 +104,7 @@ impl<'a> Parameters<'a> { } /// [`winnow`] parser for this type. - pub(crate) fn parser(input: &mut Input<'a>) -> PResult { + pub(crate) fn parser(input: &mut Input<'a>) -> ModalResult { trace("Parameters", spanned(tuple_parser(ParameterSpecifier::parser))) .parse_next(input) .map(|(span, params)| Self { span, params }) diff --git a/crates/sol-type-parser/src/root.rs b/crates/sol-type-parser/src/root.rs index f56b2a546..08284d2bf 100644 --- a/crates/sol-type-parser/src/root.rs +++ b/crates/sol-type-parser/src/root.rs @@ -1,6 +1,6 @@ use crate::{ident::identifier_parser, is_valid_identifier, new_input, Error, Input, Result}; use core::fmt; -use winnow::{combinator::trace, stream::Stream, PResult, Parser}; +use winnow::{combinator::trace, stream::Stream, ModalResult, Parser}; /// A root type, with no array suffixes. Corresponds to a single, non-sequence /// type. This is the most basic type specifier. @@ -73,7 +73,7 @@ impl<'a> RootType<'a> { } /// [`winnow`] parser for this type. - pub(crate) fn parser(input: &mut Input<'a>) -> PResult { + pub(crate) fn parser(input: &mut Input<'a>) -> ModalResult { trace("RootType", |input: &mut Input<'a>| { identifier_parser(input).map(|ident| { // Workaround for enums in library function params or returns. diff --git a/crates/sol-type-parser/src/stem.rs b/crates/sol-type-parser/src/stem.rs index 94a6ac34d..97c31b96f 100644 --- a/crates/sol-type-parser/src/stem.rs +++ b/crates/sol-type-parser/src/stem.rs @@ -1,5 +1,5 @@ use crate::{Error, Input, Result, RootType, TupleSpecifier}; -use winnow::{combinator::trace, PResult, Parser}; +use winnow::{combinator::trace, ModalResult, Parser}; /// A stem of a Solidity array type. It is either a root type, or a tuple type. /// @@ -54,7 +54,7 @@ impl<'a> TypeStem<'a> { } /// [`winnow`] parser for this type. - pub(crate) fn parser(input: &mut Input<'a>) -> PResult { + pub(crate) fn parser(input: &mut Input<'a>) -> ModalResult { let name = "TypeStem"; if input.starts_with('(') || input.starts_with("tuple(") { trace(name, TupleSpecifier::parser).parse_next(input).map(Self::Tuple) diff --git a/crates/sol-type-parser/src/tuple.rs b/crates/sol-type-parser/src/tuple.rs index 9c25f1aaf..ae32057a1 100644 --- a/crates/sol-type-parser/src/tuple.rs +++ b/crates/sol-type-parser/src/tuple.rs @@ -6,7 +6,7 @@ use crate::{ use alloc::vec::Vec; use winnow::{ combinator::{opt, preceded, trace}, - PResult, Parser, + ModalResult, Parser, }; /// A tuple specifier, with no array suffixes. Corresponds to a sequence of @@ -60,14 +60,14 @@ impl<'a> TupleSpecifier<'a> { } /// [`winnow`] parser for this type. - pub(crate) fn parser(input: &mut Input<'a>) -> PResult { + pub(crate) fn parser(input: &mut Input<'a>) -> ModalResult { trace("TupleSpecifier", spanned(Self::parse_types)) .parse_next(input) .map(|(span, types)| Self { span, types }) } #[inline] - fn parse_types(input: &mut Input<'a>) -> PResult>> { + fn parse_types(input: &mut Input<'a>) -> ModalResult>> { preceded(opt("tuple"), tuple_parser(TypeSpecifier::parser)).parse_next(input) } diff --git a/crates/sol-type-parser/src/type_spec.rs b/crates/sol-type-parser/src/type_spec.rs index a6f748f93..89e635d30 100644 --- a/crates/sol-type-parser/src/type_spec.rs +++ b/crates/sol-type-parser/src/type_spec.rs @@ -9,7 +9,7 @@ use winnow::{ ascii::digit0, combinator::{cut_err, delimited, repeat, trace}, error::{ErrMode, ErrorKind, FromExternalError}, - PResult, Parser, + ModalResult, Parser, }; /// Represents a type-name. Consists of an identifier and optional array sizes. @@ -93,7 +93,7 @@ impl<'a> TypeSpecifier<'a> { } /// [`winnow`] parser for this type. - pub(crate) fn parser(input: &mut Input<'a>) -> PResult { + pub(crate) fn parser(input: &mut Input<'a>) -> ModalResult { trace( "TypeSpecifier", spanned(|input: &mut Input<'a>| { @@ -139,7 +139,7 @@ impl<'a> TypeSpecifier<'a> { } } -fn array_size_parser(input: &mut Input<'_>) -> PResult> { +fn array_size_parser(input: &mut Input<'_>) -> ModalResult> { let digits = digit0(input)?; if digits.is_empty() { return Ok(None); diff --git a/crates/sol-type-parser/src/utils.rs b/crates/sol-type-parser/src/utils.rs index d9cc6f7c0..5e8975407 100644 --- a/crates/sol-type-parser/src/utils.rs +++ b/crates/sol-type-parser/src/utils.rs @@ -11,7 +11,7 @@ use winnow::{ combinator::{alt, cut_err, opt, preceded, separated, terminated, trace}, error::{ContextError, StrContext, StrContextValue}, stream::{Accumulate, AsChar, Stream}, - PResult, Parser, + ModalResult, Parser, }; pub use crate::ident::identifier; @@ -96,7 +96,7 @@ where }) } -pub fn opt_ws_ident<'a>(input: &mut Input<'a>) -> PResult> { +pub fn opt_ws_ident<'a>(input: &mut Input<'a>) -> ModalResult> { preceded(space0, opt(identifier_parser)).parse_next(input) }