From b9c638c280fcf7d2ebee341147d02c2f55bb151e Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 14 Oct 2023 19:02:35 -0400 Subject: [PATCH] Fix tracing. --- src/parser/babel_call.rs | 2 +- src/parser/diary_sexp.rs | 2 +- src/parser/drawer.rs | 2 +- src/parser/dynamic_block.rs | 2 +- src/parser/element_parser.rs | 2 -- src/parser/fixed_width_area.rs | 2 +- src/parser/footnote_definition.rs | 2 +- src/parser/greater_block.rs | 8 ++++---- src/parser/horizontal_rule.rs | 2 +- src/parser/keyword.rs | 2 +- src/parser/latex_environment.rs | 2 +- src/parser/lesser_block.rs | 10 +++++----- src/parser/paragraph.rs | 2 +- src/parser/plain_list.rs | 2 +- src/parser/table.rs | 2 +- 15 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/parser/babel_call.rs b/src/parser/babel_call.rs index a40f0764..cc41de85 100644 --- a/src/parser/babel_call.rs +++ b/src/parser/babel_call.rs @@ -30,7 +30,7 @@ use crate::types::Keyword; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn babel_call<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/diary_sexp.rs b/src/parser/diary_sexp.rs index 5b2cbfe5..348c2e3b 100644 --- a/src/parser/diary_sexp.rs +++ b/src/parser/diary_sexp.rs @@ -18,7 +18,7 @@ use crate::types::Keyword; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn diary_sexp<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/drawer.rs b/src/parser/drawer.rs index 8c6f27cb..74dd3f6c 100644 --- a/src/parser/drawer.rs +++ b/src/parser/drawer.rs @@ -36,7 +36,7 @@ use crate::types::SetSource; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn drawer<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/dynamic_block.rs b/src/parser/dynamic_block.rs index 3a7984cd..2f87a2ce 100644 --- a/src/parser/dynamic_block.rs +++ b/src/parser/dynamic_block.rs @@ -42,7 +42,7 @@ use crate::types::SetSource; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn dynamic_block<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/element_parser.rs b/src/parser/element_parser.rs index bf043882..48cf5431 100644 --- a/src/parser/element_parser.rs +++ b/src/parser/element_parser.rs @@ -1,7 +1,5 @@ use nom::branch::alt; use nom::multi::many0; -#[cfg(feature = "tracing")] -use tracing::span; use super::babel_call::babel_call; use super::clock::clock; diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs index 642e824d..2f94e908 100644 --- a/src/parser/fixed_width_area.rs +++ b/src/parser/fixed_width_area.rs @@ -25,7 +25,7 @@ use crate::types::Keyword; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn fixed_width_area<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/footnote_definition.rs b/src/parser/footnote_definition.rs index 8b669cd1..611a674e 100644 --- a/src/parser/footnote_definition.rs +++ b/src/parser/footnote_definition.rs @@ -37,7 +37,7 @@ use crate::types::Keyword; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn footnote_definition<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/greater_block.rs b/src/parser/greater_block.rs index daf59dfc..2b4d1c6c 100644 --- a/src/parser/greater_block.rs +++ b/src/parser/greater_block.rs @@ -45,7 +45,7 @@ use crate::types::SpecialBlock; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn greater_block<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, @@ -93,7 +93,7 @@ where #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] fn center_block<'b, 'g, 'r, 's, AK>( context: RefContext<'b, 'g, 'r, 's>, @@ -126,7 +126,7 @@ where #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] fn quote_block<'b, 'g, 'r, 's, AK>( context: RefContext<'b, 'g, 'r, 's>, @@ -184,7 +184,7 @@ where #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] fn _special_block<'c, 'b, 'g, 'r, 's, AK>( context: RefContext<'b, 'g, 'r, 's>, diff --git a/src/parser/horizontal_rule.rs b/src/parser/horizontal_rule.rs index ec45d95c..eb1e015d 100644 --- a/src/parser/horizontal_rule.rs +++ b/src/parser/horizontal_rule.rs @@ -20,7 +20,7 @@ use crate::types::Keyword; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn horizontal_rule<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/keyword.rs b/src/parser/keyword.rs index 24a5f891..73055956 100644 --- a/src/parser/keyword.rs +++ b/src/parser/keyword.rs @@ -91,7 +91,7 @@ fn _filtered_keyword<'s, F: Matcher>( #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn keyword<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/latex_environment.rs b/src/parser/latex_environment.rs index af41d91d..11ccde2c 100644 --- a/src/parser/latex_environment.rs +++ b/src/parser/latex_environment.rs @@ -29,7 +29,7 @@ use crate::types::LatexEnvironment; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn latex_environment<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/lesser_block.rs b/src/parser/lesser_block.rs index 37f30918..b53d622c 100644 --- a/src/parser/lesser_block.rs +++ b/src/parser/lesser_block.rs @@ -50,7 +50,7 @@ use crate::types::VerseBlock; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn verse_block<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, @@ -118,7 +118,7 @@ where #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn comment_block<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, @@ -166,7 +166,7 @@ where #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn example_block<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, @@ -247,7 +247,7 @@ where #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn export_block<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, @@ -303,7 +303,7 @@ where #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn src_block<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs index cd8ce7e2..9299601f 100644 --- a/src/parser/paragraph.rs +++ b/src/parser/paragraph.rs @@ -26,7 +26,7 @@ use crate::types::Paragraph; #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn paragraph<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/plain_list.rs b/src/parser/plain_list.rs index f3148f24..e2807bd5 100644 --- a/src/parser/plain_list.rs +++ b/src/parser/plain_list.rs @@ -82,7 +82,7 @@ pub(crate) fn detect_plain_list<'b, 'g, 'r, 's>( #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn plain_list<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK, diff --git a/src/parser/table.rs b/src/parser/table.rs index e8f615da..b3fdd90e 100644 --- a/src/parser/table.rs +++ b/src/parser/table.rs @@ -39,7 +39,7 @@ use crate::types::TableRow; /// This is not the table.el style. #[cfg_attr( feature = "tracing", - tracing::instrument(ret, level = "debug", skip(context)) + tracing::instrument(ret, level = "debug", skip(context, affiliated_keywords)) )] pub(crate) fn org_mode_table<'b, 'g, 'r, 's, AK>( affiliated_keywords: AK,