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

Continue removing MyError.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-17 10:09:37 -04:00
parent c9d7251e3b
commit 77e6c22ad8
29 changed files with 84 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/parser/object_parser.rs
View File

@@ -42,7 +42,7 @@ pub(crate) fn standard_set_object<'b, 'g, 'r, 's>(
input,
Object::PlainText
);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -60,7 +60,7 @@ pub(crate) fn minimal_set_object<'b, 'g, 'r, 's>(
input,
Object::PlainText
);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -102,7 +102,7 @@ fn standard_set_object_sans_plain_text<'b, 'g, 'r, 's>(
element!(angle_link, context, input, Object::AngleLink);
element!(org_macro, context, input, Object::OrgMacro);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -118,7 +118,7 @@ fn minimal_set_object_sans_plain_text<'b, 'g, 'r, 's>(
element!(entity, context, input, Object::Entity);
element!(latex_fragment, context, input, Object::LatexFragment);
element!(text_markup, context, input);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -136,9 +136,7 @@ pub(crate) fn detect_standard_set_object_sans_plain_text<'b, 'g, 'r, 's>(
return Ok((input, ()));
}
return Err(nom::Err::Error(CustomError::MyError(MyError(
"No object detected.",
))));
return Err(nom::Err::Error(CustomError::Static("No object detected.")));
}
#[cfg_attr(
@@ -156,9 +154,7 @@ fn detect_minimal_set_object_sans_plain_text<'b, 'g, 'r, 's>(
return Ok((input, ()));
}
return Err(nom::Err::Error(CustomError::MyError(MyError(
"No object detected.",
))));
return Err(nom::Err::Error(CustomError::Static("No object detected.")));
}
#[cfg_attr(
@@ -181,7 +177,7 @@ pub(crate) fn regular_link_description_set_object<'b, 'g, 'r, 's>(
input,
Object::PlainText
);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -204,7 +200,7 @@ fn regular_link_description_set_object_sans_plain_text<'b, 'g, 'r, 's>(
element!(inline_babel_call, context, input, Object::InlineBabelCall);
element!(org_macro, context, input, Object::OrgMacro);
element!(minimal_set_object_sans_plain_text, context, input);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -222,9 +218,7 @@ fn detect_regular_link_description_set_object_sans_plain_text<'b, 'g, 'r, 's>(
return Ok((input, ()));
}
Err(nom::Err::Error(CustomError::MyError(MyError(
"No object detected.",
))))
Err(nom::Err::Error(CustomError::Static("No object detected.")))
}
#[cfg_attr(
@@ -242,7 +236,7 @@ pub(crate) fn table_cell_set_object<'b, 'g, 'r, 's>(
input,
Object::PlainText
);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -270,7 +264,7 @@ fn table_cell_set_object_sans_plain_text<'b, 'g, 'r, 's>(
element!(target, context, input, Object::Target);
element!(timestamp, context, input, Object::Timestamp);
element!(minimal_set_object_sans_plain_text, context, input);
Err(nom::Err::Error(CustomError::MyError(MyError("No object."))))
Err(nom::Err::Error(CustomError::Static("No object.")))
}
#[cfg_attr(
@@ -288,7 +282,5 @@ fn detect_table_cell_set_object_sans_plain_text<'b, 'g, 'r, 's>(
return Ok((input, ()));
}
return Err(nom::Err::Error(CustomError::MyError(MyError(
"No object detected.",
))));
return Err(nom::Err::Error(CustomError::Static("No object detected.")));
}