chore: fix winnow deprecation warnings (#507)

alloy-rs · Jan 28, 2024 · 126cf6a · 126cf6a
1 parent 4049e03
commit 126cf6a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/crates/dyn-abi/src/coerce.rs b/crates/dyn-abi/src/coerce.rs
@@ -7,14 +7,13 @@ use hex::FromHexError;
 use parser::utils::{array_parser, char_parser, spanned};
 use winnow::{
     ascii::{alpha0, alpha1, digit1, hex_digit0, hex_digit1, space0},
-    combinator::{cut_err, dispatch, fail, opt, preceded, success},
+    combinator::{cut_err, dispatch, empty, fail, opt, preceded, trace},
     error::{
         AddContext, ContextError, ErrMode, ErrorKind, FromExternalError, StrContext,
         StrContextValue,
     },
     stream::Stream,
     token::take_while,
-    trace::trace,
     PResult, Parser,
 };
 
@@ -294,8 +293,8 @@ fn bool(input: &mut &str) -> PResult<bool> {
     trace(
         "bool",
         dispatch! {alpha1.context(StrContext::Label("boolean"));
-            "true" => success(true),
-            "false" => success(false),
+            "true" => empty.value(true),
+            "false" => empty.value(false),
             _ => fail
         }
         .context(StrContext::Label("boolean")),
@@ -437,9 +436,9 @@ fn int_units(input: &mut &str) -> PResult<usize> {
     trace(
         "int_units",
         dispatch! {alpha0;
-            "ether" => success(18),
-            "gwei" | "nano" | "nanoether" => success(9),
-            "" | "wei" => success(0),
+            "ether" => empty.value(18),
+            "gwei" | "nano" | "nanoether" => empty.value(9),
+            "" | "wei" => empty.value(0),
             _ => fail,
         },
     )

diff --git a/crates/sol-type-parser/src/parameter.rs b/crates/sol-type-parser/src/parameter.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use alloc::vec::Vec;
 use core::fmt;
-use winnow::{trace::trace, PResult, Parser};
+use winnow::{combinator::trace, PResult, Parser};
 
 // TODO: Parse visibility and state mutability
 

diff --git a/crates/sol-type-parser/src/root.rs b/crates/sol-type-parser/src/root.rs
@@ -1,6 +1,6 @@
 use crate::{ident::identifier, is_valid_identifier, Error, Result};
 use core::fmt;
-use winnow::{trace::trace, PResult, Parser};
+use winnow::{combinator::trace, PResult, Parser};
 
 /// A root type, with no array suffixes. Corresponds to a single, non-sequence
 /// type. This is the most basic type specifier.

diff --git a/crates/sol-type-parser/src/stem.rs b/crates/sol-type-parser/src/stem.rs
@@ -1,5 +1,5 @@
 use crate::{Error, Result, RootType, TupleSpecifier};
-use winnow::{trace::trace, PResult, Parser};
+use winnow::{combinator::trace, PResult, Parser};
 
 /// A stem of a Solidity array type. It is either a root type, or a tuple type.
 ///

diff --git a/crates/sol-type-parser/src/tuple.rs b/crates/sol-type-parser/src/tuple.rs
@@ -3,7 +3,7 @@ use crate::{
     Error, Result, TypeSpecifier,
 };
 use alloc::vec::Vec;
-use winnow::{trace::trace, PResult, Parser};
+use winnow::{combinator::trace, PResult, Parser};
 
 /// A tuple specifier, with no array suffixes. Corresponds to a sequence of
 /// types.

diff --git a/crates/sol-type-parser/src/type_spec.rs b/crates/sol-type-parser/src/type_spec.rs
@@ -6,9 +6,8 @@ use alloc::vec::Vec;
 use core::num::NonZeroUsize;
 use winnow::{
     ascii::digit0,
-    combinator::{cut_err, delimited, repeat},
+    combinator::{cut_err, delimited, repeat, trace},
     error::{ErrMode, ErrorKind, FromExternalError},
-    trace::trace,
     PResult, Parser,
 };
 

diff --git a/crates/sol-type-parser/src/utils.rs b/crates/sol-type-parser/src/utils.rs
@@ -5,10 +5,9 @@ use alloc::{string::String, vec::Vec};
 use core::{slice, str};
 use winnow::{
     ascii::space0,
-    combinator::{cut_err, delimited, opt, preceded, separated, terminated},
+    combinator::{cut_err, delimited, opt, preceded, separated, terminated, trace},
     error::{AddContext, ParserError, StrContext, StrContextValue},
     stream::Accumulate,
-    trace::trace,
     PResult, Parser,
 };