talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Begin removing the MyError type.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-17 09:45:18 -04:00
parent 8417b5fc9d
commit c9d7251e3b
33 changed files with 12 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/parser/org_source.rs
View File

@@ -10,9 +10,6 @@ use nom::InputTakeAtPosition;
use nom::Offset;
use nom::Slice;
use crate::error::CustomError;
use crate::error::MyError;
pub(crate) type BracketDepth = i16;
#[derive(Copy, Clone, PartialEq)]
@@ -385,34 +382,6 @@ impl<'n, 's> FindSubstring<&'n str> for OrgSource<'s> {
}
}
pub(crate) fn convert_error<'a, I: Into<CustomError<&'a str>>>(
err: nom::Err<I>,
) -> nom::Err<CustomError<&'a str>> {
match err {
nom::Err::Incomplete(needed) => nom::Err::Incomplete(needed),
nom::Err::Error(err) => nom::Err::Error(err.into()),
nom::Err::Failure(err) => nom::Err::Failure(err.into()),
}
}
impl<'s> From<CustomError<OrgSource<'s>>> for CustomError<&'s str> {
fn from(value: CustomError<OrgSource<'s>>) -> Self {
match value {
CustomError::MyError(err) => CustomError::MyError(err),
CustomError::Nom(input, error_kind) => CustomError::Nom(input.into(), error_kind),
CustomError::IO(err) => CustomError::IO(err),
CustomError::BoxedError(err) => CustomError::BoxedError(err),
CustomError::Text(err) => CustomError::Text(err),
}
}
}
impl<'s> From<MyError<OrgSource<'s>>> for MyError<&'s str> {
fn from(value: MyError<OrgSource<'s>>) -> Self {
MyError(value.0.into())
}
}
#[cfg(test)]
mod tests {
use super::*;