Move Res into the error type module.

This commit is contained in:
Tom Alexander 2022-12-18 02:59:41 -05:00
parent a005502d97
commit 54ed989300
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
6 changed files with 8 additions and 12 deletions

View File

@ -3,12 +3,12 @@ use crate::parser::parser_with_context::parser_with_context;
use super::combinator::context_many_till; use super::combinator::context_many_till;
use super::error::CustomError; use super::error::CustomError;
use super::error::MyError; use super::error::MyError;
use super::error::Res;
use super::parser_context::ChainBehavior; use super::parser_context::ChainBehavior;
use super::parser_context::ContextElement; use super::parser_context::ContextElement;
use super::parser_context::ExitMatcherNode; use super::parser_context::ExitMatcherNode;
use super::text::symbol; use super::text::symbol;
use super::text::Bold; use super::text::Bold;
use super::text::Res;
use super::text::TextElement; use super::text::TextElement;
use super::text_element_parser::flat_text_element; use super::text_element_parser::flat_text_element;
use super::text_element_parser::in_section; use super::text_element_parser::in_section;

View File

@ -1,5 +1,8 @@
use nom::error::ErrorKind; use nom::error::ErrorKind;
use nom::error::ParseError; use nom::error::ParseError;
use nom::IResult;
pub type Res<T, U> = IResult<T, U, CustomError<T>>;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum CustomError<I> { pub enum CustomError<I> {

View File

@ -3,12 +3,12 @@ use crate::parser::parser_with_context::parser_with_context;
use super::combinator::context_many_till; use super::combinator::context_many_till;
use super::error::CustomError; use super::error::CustomError;
use super::error::MyError; use super::error::MyError;
use super::error::Res;
use super::parser_context::ChainBehavior; use super::parser_context::ChainBehavior;
use super::parser_context::ContextElement; use super::parser_context::ContextElement;
use super::parser_context::ExitMatcherNode; use super::parser_context::ExitMatcherNode;
use super::text::symbol; use super::text::symbol;
use super::text::Link; use super::text::Link;
use super::text::Res;
use super::text::TextElement; use super::text::TextElement;
use super::text_element_parser::flat_text_element; use super::text_element_parser::flat_text_element;
use super::text_element_parser::in_section; use super::text_element_parser::in_section;

View File

@ -1,11 +1,11 @@
use super::combinator::context_many_till; use super::combinator::context_many_till;
use super::error::Res;
use super::parser_context::ChainBehavior; use super::parser_context::ChainBehavior;
use super::parser_context::ContextElement; use super::parser_context::ContextElement;
use super::parser_context::ExitMatcherNode; use super::parser_context::ExitMatcherNode;
use super::text::blank_line; use super::text::blank_line;
use super::text::line_break; use super::text::line_break;
use super::text::Paragraph; use super::text::Paragraph;
use super::text::Res;
use super::text::TextElement; use super::text::TextElement;
use super::text_element_parser::flat_text_element; use super::text_element_parser::flat_text_element;
use super::token::Token; use super::token::Token;

View File

@ -1,19 +1,12 @@
use nom::branch::alt;
use nom::bytes::complete::tag; use nom::bytes::complete::tag;
use nom::character::complete::alphanumeric1; use nom::character::complete::alphanumeric1;
use nom::character::complete::line_ending; use nom::character::complete::line_ending;
use nom::character::complete::space1; use nom::character::complete::space1;
use nom::combinator::eof;
use nom::combinator::map; use nom::combinator::map;
use nom::combinator::recognize; use nom::combinator::recognize;
use nom::multi::many1;
use nom::multi::many_till; use nom::multi::many_till;
use nom::sequence::tuple;
use nom::IResult;
use super::error::CustomError; use super::error::Res;
pub type Res<T, U> = IResult<T, U, CustomError<T>>;
#[derive(Debug)] #[derive(Debug)]
pub enum TextElement<'a> { pub enum TextElement<'a> {

View File

@ -1,6 +1,7 @@
//! A single element of text. //! A single element of text.
use super::bold::bold; use super::bold::bold;
use super::combinator::context_many1; use super::combinator::context_many1;
use super::error::Res;
use super::link::link; use super::link::link;
use super::paragraph::paragraph; use super::paragraph::paragraph;
use super::parser_context::ContextElement; use super::parser_context::ContextElement;
@ -10,7 +11,6 @@ use super::text::space;
use super::text::span; use super::text::span;
use super::text::symbol; use super::text::symbol;
use super::text::Paragraph; use super::text::Paragraph;
use super::text::Res;
use super::text::TextElement; use super::text::TextElement;
use super::token::Token; use super::token::Token;
use super::Context; use super::Context;