diff --git a/src/parser/bold.rs b/src/parser/bold.rs index fe6986b0..0f2d7675 100644 --- a/src/parser/bold.rs +++ b/src/parser/bold.rs @@ -3,12 +3,12 @@ use crate::parser::parser_with_context::parser_with_context; use super::combinator::context_many_till; use super::error::CustomError; use super::error::MyError; +use super::error::Res; use super::parser_context::ChainBehavior; use super::parser_context::ContextElement; use super::parser_context::ExitMatcherNode; use super::text::symbol; use super::text::Bold; -use super::text::Res; use super::text::TextElement; use super::text_element_parser::flat_text_element; use super::text_element_parser::in_section; diff --git a/src/parser/error.rs b/src/parser/error.rs index 10b48634..abe5d86f 100644 --- a/src/parser/error.rs +++ b/src/parser/error.rs @@ -1,5 +1,8 @@ use nom::error::ErrorKind; use nom::error::ParseError; +use nom::IResult; + +pub type Res = IResult>; #[derive(Debug, PartialEq)] pub enum CustomError { diff --git a/src/parser/link.rs b/src/parser/link.rs index d28ef707..c78b2df4 100644 --- a/src/parser/link.rs +++ b/src/parser/link.rs @@ -3,12 +3,12 @@ use crate::parser::parser_with_context::parser_with_context; use super::combinator::context_many_till; use super::error::CustomError; use super::error::MyError; +use super::error::Res; use super::parser_context::ChainBehavior; use super::parser_context::ContextElement; use super::parser_context::ExitMatcherNode; use super::text::symbol; use super::text::Link; -use super::text::Res; use super::text::TextElement; use super::text_element_parser::flat_text_element; use super::text_element_parser::in_section; diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs index 43c987a0..61629726 100644 --- a/src/parser/paragraph.rs +++ b/src/parser/paragraph.rs @@ -1,11 +1,11 @@ use super::combinator::context_many_till; +use super::error::Res; use super::parser_context::ChainBehavior; use super::parser_context::ContextElement; use super::parser_context::ExitMatcherNode; use super::text::blank_line; use super::text::line_break; use super::text::Paragraph; -use super::text::Res; use super::text::TextElement; use super::text_element_parser::flat_text_element; use super::token::Token; diff --git a/src/parser/text.rs b/src/parser/text.rs index 637a7d9a..13d52061 100644 --- a/src/parser/text.rs +++ b/src/parser/text.rs @@ -1,19 +1,12 @@ -use nom::branch::alt; use nom::bytes::complete::tag; use nom::character::complete::alphanumeric1; use nom::character::complete::line_ending; use nom::character::complete::space1; -use nom::combinator::eof; use nom::combinator::map; use nom::combinator::recognize; -use nom::multi::many1; use nom::multi::many_till; -use nom::sequence::tuple; -use nom::IResult; -use super::error::CustomError; - -pub type Res = IResult>; +use super::error::Res; #[derive(Debug)] pub enum TextElement<'a> { diff --git a/src/parser/text_element_parser.rs b/src/parser/text_element_parser.rs index ac533d80..0ea7e1dd 100644 --- a/src/parser/text_element_parser.rs +++ b/src/parser/text_element_parser.rs @@ -1,6 +1,7 @@ //! A single element of text. use super::bold::bold; use super::combinator::context_many1; +use super::error::Res; use super::link::link; use super::paragraph::paragraph; use super::parser_context::ContextElement; @@ -10,7 +11,6 @@ use super::text::space; use super::text::span; use super::text::symbol; use super::text::Paragraph; -use super::text::Res; use super::text::TextElement; use super::token::Token; use super::Context;