From bc1c10372af7baadb642c36aa6ed4369676bacb0 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Thu, 25 Jan 2024 14:53:49 -0600
Subject: [PATCH] refactor: Move off of deprecated 'trace' path

---
 src/ascii/mod.rs            | 2 +-
 src/binary/bits/mod.rs      | 2 +-
 src/binary/mod.rs           | 2 +-
 src/combinator/branch.rs    | 2 +-
 src/combinator/core.rs      | 2 +-
 src/combinator/debug/mod.rs | 2 +-
 src/combinator/mod.rs       | 2 +-
 src/combinator/multi.rs     | 2 +-
 src/combinator/parser.rs    | 2 +-
 src/combinator/sequence.rs  | 2 +-
 src/macros/dispatch.rs      | 2 +-
 src/macros/seq.rs           | 6 +++---
 src/token/mod.rs            | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/ascii/mod.rs b/src/ascii/mod.rs
index 0aacf271..31c532ca 100644
--- a/src/ascii/mod.rs
+++ b/src/ascii/mod.rs
@@ -10,6 +10,7 @@ use crate::lib::std::ops::{Add, Shl};
 use crate::combinator::alt;
 use crate::combinator::cut_err;
 use crate::combinator::opt;
+use crate::combinator::trace;
 use crate::error::ParserError;
 use crate::error::{ErrMode, ErrorKind, Needed};
 use crate::stream::{AsBStr, AsChar, ParseSlice, Stream, StreamIsPartial};
@@ -17,7 +18,6 @@ use crate::stream::{Compare, CompareResult};
 use crate::token::one_of;
 use crate::token::take_till;
 use crate::token::take_while;
-use crate::trace::trace;
 use crate::PResult;
 use crate::Parser;
 
diff --git a/src/binary/bits/mod.rs b/src/binary/bits/mod.rs
index 16a0f646..4a198c49 100644
--- a/src/binary/bits/mod.rs
+++ b/src/binary/bits/mod.rs
@@ -4,10 +4,10 @@
 #[cfg(test)]
 mod tests;
 
+use crate::combinator::trace;
 use crate::error::{ErrMode, ErrorConvert, ErrorKind, Needed, ParserError};
 use crate::lib::std::ops::{AddAssign, Div, Shl, Shr};
 use crate::stream::{AsBytes, Stream, StreamIsPartial, ToUsize};
-use crate::trace::trace;
 use crate::{unpeek, IResult, PResult, Parser};
 
 /// Number of bits in a byte
diff --git a/src/binary/mod.rs b/src/binary/mod.rs
index a80ae6ce..01053a52 100644
--- a/src/binary/mod.rs
+++ b/src/binary/mod.rs
@@ -8,6 +8,7 @@ pub mod bits;
 mod tests;
 
 use crate::combinator::repeat;
+use crate::combinator::trace;
 use crate::error::ErrMode;
 use crate::error::ErrorKind;
 use crate::error::Needed;
@@ -17,7 +18,6 @@ use crate::stream::Accumulate;
 use crate::stream::{AsBytes, Stream, StreamIsPartial};
 use crate::stream::{ToUsize, UpdateSlice};
 use crate::token::take;
-use crate::trace::trace;
 use crate::PResult;
 use crate::Parser;
 
diff --git a/src/combinator/branch.rs b/src/combinator/branch.rs
index c7597933..7fdcf8dc 100644
--- a/src/combinator/branch.rs
+++ b/src/combinator/branch.rs
@@ -1,6 +1,6 @@
+use crate::combinator::trace;
 use crate::error::{ErrMode, ErrorKind, ParserError};
 use crate::stream::Stream;
-use crate::trace::trace;
 use crate::*;
 
 #[doc(inline)]
diff --git a/src/combinator/core.rs b/src/combinator/core.rs
index b44b8302..4f764261 100644
--- a/src/combinator/core.rs
+++ b/src/combinator/core.rs
@@ -1,6 +1,6 @@
+use crate::combinator::trace;
 use crate::error::{ErrMode, ErrorKind, Needed, ParserError};
 use crate::stream::Stream;
-use crate::trace::trace;
 use crate::*;
 
 /// Return the remaining input.
diff --git a/src/combinator/debug/mod.rs b/src/combinator/debug/mod.rs
index 4c5b810a..ee4c2931 100644
--- a/src/combinator/debug/mod.rs
+++ b/src/combinator/debug/mod.rs
@@ -23,7 +23,7 @@ compile_error!("`debug` requires `std`");
 /// # use winnow::token::take_while;
 /// # use winnow::stream::AsChar;
 /// # use winnow::prelude::*;
-/// use winnow::trace::trace;
+/// use winnow::combinator::trace;
 ///
 /// fn short_alpha<'s>(s: &mut &'s [u8]) -> PResult<&'s [u8], InputError<&'s [u8]>> {
 ///   trace("short_alpha",
diff --git a/src/combinator/mod.rs b/src/combinator/mod.rs
index 6c529474..8ca4348a 100644
--- a/src/combinator/mod.rs
+++ b/src/combinator/mod.rs
@@ -76,7 +76,7 @@
 //! - [`backtrack_err`]: Attempts a parse, allowing alternative parsers to be attempted despite
 //!   use of `cut_err`
 //! - [`Parser::context`]: Add context to the error if the parser fails
-//! - [`trace`][crate::trace::trace]: Print the parse state with the `debug` feature flag
+//! - [`trace`]: Print the parse state with the `debug` feature flag
 //! - [`todo()`]: Placeholder parser
 //!
 //! ## Remaining combinators
diff --git a/src/combinator/multi.rs b/src/combinator/multi.rs
index 0c686942..926d41ee 100644
--- a/src/combinator/multi.rs
+++ b/src/combinator/multi.rs
@@ -1,12 +1,12 @@
 //! Combinators applying their child parser multiple times
 
+use crate::combinator::trace;
 use crate::error::ErrMode;
 use crate::error::ErrorKind;
 use crate::error::ParserError;
 use crate::stream::Accumulate;
 use crate::stream::Range;
 use crate::stream::Stream;
-use crate::trace::trace;
 use crate::PResult;
 use crate::Parser;
 
diff --git a/src/combinator/parser.rs b/src/combinator/parser.rs
index 4e984241..1fb54464 100644
--- a/src/combinator/parser.rs
+++ b/src/combinator/parser.rs
@@ -1,10 +1,10 @@
+use crate::combinator::trace;
 use crate::combinator::trace_result;
 use crate::error::{AddContext, ErrMode, ErrorKind, FromExternalError, ParserError};
 use crate::lib::std::borrow::Borrow;
 use crate::lib::std::ops::Range;
 use crate::stream::StreamIsPartial;
 use crate::stream::{Location, Stream};
-use crate::trace::trace;
 use crate::*;
 
 /// Implementation of [`Parser::by_ref`]
diff --git a/src/combinator/sequence.rs b/src/combinator/sequence.rs
index 4eaa6d14..0f2e6333 100644
--- a/src/combinator/sequence.rs
+++ b/src/combinator/sequence.rs
@@ -1,6 +1,6 @@
+use crate::combinator::trace;
 use crate::error::ParserError;
 use crate::stream::Stream;
-use crate::trace::trace;
 use crate::*;
 
 #[doc(inline)]
diff --git a/src/macros/dispatch.rs b/src/macros/dispatch.rs
index f16cbc31..9305fd70 100644
--- a/src/macros/dispatch.rs
+++ b/src/macros/dispatch.rs
@@ -41,7 +41,7 @@
 #[doc(hidden)] // forced to be visible in intended location
 macro_rules! dispatch {
     ($match_parser: expr; $( $pat:pat $(if $pred:expr)? => $expr: expr ),+ $(,)? ) => {
-        $crate::trace::trace("dispatch", move |i: &mut _|
+        $crate::combinator::trace("dispatch", move |i: &mut _|
         {
             use $crate::Parser;
             let initial = $match_parser.parse_next(i)?;
diff --git a/src/macros/seq.rs b/src/macros/seq.rs
index 756f3006..bb1cd25f 100644
--- a/src/macros/seq.rs
+++ b/src/macros/seq.rs
@@ -64,7 +64,7 @@
 #[doc(alias = "struct_parser")]
 macro_rules! seq {
     ($name: ident { $($fields: tt)* }) => {
-        $crate::trace::trace(stringify!($name), move |input: &mut _| {
+        $crate::combinator::trace(stringify!($name), move |input: &mut _| {
             use $crate::Parser;
             $crate::seq_parse_struct_fields!(input; $($fields)*);
             #[allow(clippy::redundant_field_names)]
@@ -72,7 +72,7 @@ macro_rules! seq {
         })
     };
     ($name: ident ( $($elements: tt)* )) => {
-        $crate::trace::trace(stringify!($name), move |input: &mut _| {
+        $crate::combinator::trace(stringify!($name), move |input: &mut _| {
             use $crate::Parser;
             $crate::seq_parse_tuple_fields!( ($($elements)*) ; ).map(|t| {
                 $crate::seq_init_tuple_fields!(
@@ -84,7 +84,7 @@ macro_rules! seq {
         })
     };
     (( $($elements: tt)* )) => {
-        $crate::trace::trace("tuple", move |input: &mut _| {
+        $crate::combinator::trace("tuple", move |input: &mut _| {
             use $crate::Parser;
             $crate::seq_parse_tuple_fields!( ($($elements)*) ; ).map(|t| {
                 $crate::seq_init_tuple_fields!(
diff --git a/src/token/mod.rs b/src/token/mod.rs
index 5855bf73..c5ce432d 100644
--- a/src/token/mod.rs
+++ b/src/token/mod.rs
@@ -3,6 +3,7 @@
 #[cfg(test)]
 mod tests;
 
+use crate::combinator::trace;
 use crate::error::ErrMode;
 use crate::error::ErrorKind;
 use crate::error::Needed;
@@ -11,7 +12,6 @@ use crate::lib::std::result::Result::Ok;
 use crate::stream::Range;
 use crate::stream::{Compare, CompareResult, ContainsToken, FindSlice, SliceLen, Stream};
 use crate::stream::{StreamIsPartial, ToUsize};
-use crate::trace::trace;
 use crate::PResult;
 use crate::Parser;