From 0b989b53a65b2a30aadd0e4de31c7355b05f2edb Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 21 Apr 2023 23:55:18 -0400 Subject: [PATCH] Fix warnings. --- src/parser/clock.rs | 2 +- src/parser/comment.rs | 2 +- src/parser/diary_sexp.rs | 2 +- src/parser/drawer.rs | 2 +- src/parser/dynamic_block.rs | 2 +- src/parser/element_parser.rs | 8 ++++---- src/parser/fixed_width_area.rs | 2 +- src/parser/footnote_definition.rs | 2 +- src/parser/greater_block.rs | 2 +- src/parser/lesser_block.rs | 2 +- src/parser/paragraph.rs | 2 +- src/parser/plain_list.rs | 2 +- src/parser/table.rs | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/parser/clock.rs b/src/parser/clock.rs index 3043c8b..22d2e2c 100644 --- a/src/parser/clock.rs +++ b/src/parser/clock.rs @@ -15,7 +15,7 @@ use super::Context; use crate::error::Res; use crate::parser::parser_with_context::parser_with_context; use crate::parser::util::get_consumed; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::Clock; diff --git a/src/parser/comment.rs b/src/parser/comment.rs index 9dd5328..15a5abc 100644 --- a/src/parser/comment.rs +++ b/src/parser/comment.rs @@ -20,7 +20,7 @@ use crate::parser::parser_context::ContextElement; use crate::parser::parser_with_context::parser_with_context; use crate::parser::util::exit_matcher_parser; use crate::parser::util::immediate_in_section; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::Comment; diff --git a/src/parser/diary_sexp.rs b/src/parser/diary_sexp.rs index bb4abd7..856648b 100644 --- a/src/parser/diary_sexp.rs +++ b/src/parser/diary_sexp.rs @@ -10,7 +10,7 @@ use super::sexp::sexp; use super::Context; use crate::error::Res; use crate::parser::util::get_consumed; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::DiarySexp; diff --git a/src/parser/drawer.rs b/src/parser/drawer.rs index 4e6765a..e6e0fe0 100644 --- a/src/parser/drawer.rs +++ b/src/parser/drawer.rs @@ -23,7 +23,7 @@ use crate::parser::util::blank_line; use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; use crate::parser::util::immediate_in_section; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::util::WORD_CONSTITUENT_CHARACTERS; use crate::parser::Drawer; diff --git a/src/parser/dynamic_block.rs b/src/parser/dynamic_block.rs index 71a401d..5d6e156 100644 --- a/src/parser/dynamic_block.rs +++ b/src/parser/dynamic_block.rs @@ -13,7 +13,7 @@ use crate::parser::util::blank_line; use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; use crate::parser::util::immediate_in_section; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::Element; use nom::branch::alt; diff --git a/src/parser/element_parser.rs b/src/parser/element_parser.rs index 7a09aff..35aa79d 100644 --- a/src/parser/element_parser.rs +++ b/src/parser/element_parser.rs @@ -18,7 +18,7 @@ use super::paragraph::paragraph; use super::plain_list::plain_list; use super::util::get_consumed; use super::util::maybe_consume_trailing_whitespace_if_not_exiting; -use super::util::start_of_line; + use super::Context; use crate::error::Res; use crate::parser::parser_with_context::parser_with_context; @@ -41,13 +41,13 @@ pub fn paragraph_element<'r, 's>( ) -> Res<&'s str, Element<'s>> { let paragraph_matcher = parser_with_context!(paragraph)(context); let keyword_matcher = parser_with_context!(keyword)(context); - let (remaining, affiliated_keywords) = many0(keyword_matcher)(input)?; + let (remaining, _affiliated_keywords) = many0(keyword_matcher)(input)?; let (remaining, element) = map(paragraph_matcher, Element::Paragraph)(remaining)?; let (remaining, _trailing_ws) = maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?; - let source = get_consumed(input, remaining); + let _source = get_consumed(input, remaining); Ok((remaining, element)) } @@ -102,7 +102,7 @@ pub fn non_paragraph_element<'r, 's>( let (remaining, _trailing_ws) = maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?; - let source = get_consumed(input, remaining); + let _source = get_consumed(input, remaining); Ok((remaining, element)) } diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs index ed8853e..147ef87 100644 --- a/src/parser/fixed_width_area.rs +++ b/src/parser/fixed_width_area.rs @@ -16,7 +16,7 @@ use crate::error::Res; use crate::parser::parser_with_context::parser_with_context; use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::FixedWidthArea; diff --git a/src/parser/footnote_definition.rs b/src/parser/footnote_definition.rs index faaad70..b4e5f29 100644 --- a/src/parser/footnote_definition.rs +++ b/src/parser/footnote_definition.rs @@ -14,7 +14,7 @@ use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; use crate::parser::util::immediate_in_section; use crate::parser::util::maybe_consume_trailing_whitespace; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use nom::branch::alt; use nom::bytes::complete::tag; diff --git a/src/parser/greater_block.rs b/src/parser/greater_block.rs index 7727247..7855a2c 100644 --- a/src/parser/greater_block.rs +++ b/src/parser/greater_block.rs @@ -12,7 +12,7 @@ use crate::parser::util::blank_line; use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; use crate::parser::util::immediate_in_section; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::Element; use crate::parser::Paragraph; diff --git a/src/parser/lesser_block.rs b/src/parser/lesser_block.rs index 9844286..764a556 100644 --- a/src/parser/lesser_block.rs +++ b/src/parser/lesser_block.rs @@ -30,7 +30,7 @@ use crate::parser::plain_text::plain_text; use crate::parser::util::blank_line; use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; #[tracing::instrument(ret, level = "debug")] diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs index e1b30f4..94ccf75 100644 --- a/src/parser/paragraph.rs +++ b/src/parser/paragraph.rs @@ -13,7 +13,7 @@ use crate::parser::parser_context::ContextElement; use crate::parser::parser_context::ExitMatcherNode; use crate::parser::parser_with_context::parser_with_context; use crate::parser::util::exit_matcher_parser; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use super::element_parser::non_paragraph_element; diff --git a/src/parser/plain_list.rs b/src/parser/plain_list.rs index d5af25c..73c4c86 100644 --- a/src/parser/plain_list.rs +++ b/src/parser/plain_list.rs @@ -1,7 +1,7 @@ use super::greater_element::PlainList; use super::greater_element::PlainListItem; use super::parser_with_context::parser_with_context; -use super::util::maybe_consume_trailing_whitespace_if_not_exiting; + use super::util::non_whitespace_character; use super::Context; use crate::error::CustomError; diff --git a/src/parser/table.rs b/src/parser/table.rs index e8924ef..275e754 100644 --- a/src/parser/table.rs +++ b/src/parser/table.rs @@ -24,7 +24,7 @@ use crate::parser::parser_context::ExitMatcherNode; use crate::parser::parser_with_context::parser_with_context; use crate::parser::util::exit_matcher_parser; use crate::parser::util::get_consumed; -use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting; + use crate::parser::util::start_of_line; use crate::parser::Table;