From 42a48efe9d39b5d64d0d00713708c8afdc156713 Mon Sep 17 00:00:00 2001 From: Edward Shen Date: Wed, 24 Feb 2021 18:00:15 -0500 Subject: [PATCH] move fully_sumed to test_util --- src/parser.rs | 19 ++++++++----------- src/test_util.rs | 4 ++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/parser.rs b/src/parser.rs index 3f55659..54b567a 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -774,15 +774,10 @@ fn take_common bool>(i: &[u8], f: F) -> IResult<&[u8], &[u8]> { } } -#[cfg(test)] -fn fully_consumed(t: T) -> (&'static [u8], T) { - (&[], t) -} - #[cfg(test)] mod comments { use super::*; - use crate::test_util::comment as parsed_comment; + use crate::test_util::{comment as parsed_comment, fully_consumed}; #[test] fn semicolon() { @@ -812,7 +807,7 @@ mod comments { #[cfg(test)] mod section_headers { use super::*; - use crate::test_util::section_header as parsed_section_header; + use crate::test_util::{fully_consumed, section_header as parsed_section_header}; #[test] fn no_subsection() { @@ -884,6 +879,7 @@ mod section_headers { #[cfg(test)] mod config_name { use super::*; + use crate::test_util::fully_consumed; #[test] fn just_name() { @@ -940,7 +936,7 @@ mod section_body { #[cfg(test)] mod value_no_continuation { use super::*; - use crate::test_util::value_event; + use crate::test_util::{fully_consumed, value_event}; #[test] fn no_comment() { @@ -1019,7 +1015,7 @@ mod value_no_continuation { #[cfg(test)] mod value_continuation { use super::*; - use crate::test_util::{newline_event, value_done_event, value_not_done_event}; + use crate::test_util::{fully_consumed, newline_event, value_done_event, value_not_done_event}; #[test] fn simple_continuation() { @@ -1082,8 +1078,9 @@ mod value_continuation { mod section { use super::*; use crate::test_util::{ - comment_event, name_event, newline_event, section_header as parsed_section_header, - value_done_event, value_event, value_not_done_event, whitespace_event, + comment_event, fully_consumed, name_event, newline_event, + section_header as parsed_section_header, value_done_event, value_event, + value_not_done_event, whitespace_event, }; #[test] diff --git a/src/test_util.rs b/src/test_util.rs index 5100eb9..81f862b 100644 --- a/src/test_util.rs +++ b/src/test_util.rs @@ -67,3 +67,7 @@ pub(crate) fn comment(comment_tag: char, comment: &'static str) -> ParsedComment comment: Cow::Borrowed(comment.into()), } } + +pub(crate) fn fully_consumed(t: T) -> (&'static [u8], T) { + (&[], t) +}