zaphar/abortable_parser
1
0
Fork 0
mirror of https://github.com/zaphar/abortable_parser.git synced 2025-07-25 21:09:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Error.err becomes msg instead for clarity.

Browse Source
This commit is contained in:
Jeremy Wall 2018-09-07 20:46:17 -05:00
parent 29b5d71bb1
commit 085b31b204
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib.rs
View File

@ -21,7 +21,7 @@ pub trait InputIter: Iterator + Clone + Offsetable {}
/// an optional cause. /// an optional cause.
#[derive(Debug)] #[derive(Debug)]
pub struct Error<E: Display + Debug> { pub struct Error<E: Display + Debug> {
err: E, msg: E,
offset: usize, offset: usize,
cause: Option<Box<Error<E>>>, cause: Option<Box<Error<E>>>,
} }
@ -30,24 +30,24 @@ impl<E: Display + Debug> Error<E> {
/// Constructs a new Error with an offset and no cause. /// Constructs a new Error with an offset and no cause.
pub fn new<S: Offsetable>(err: E, offset: &S) -> Self { pub fn new<S: Offsetable>(err: E, offset: &S) -> Self {
Error { Error {
err: err, msg: err,
offset: offset.get_offset(), offset: offset.get_offset(),
cause: None, cause: None,
} }
} }
/// Constructs a new Error with an offset and a cause. /// Constructs a new Error with an offset and a cause.
pub fn caused_by<S: Offsetable>(err: E, offset: &S, cause: Self) -> Self { pub fn caused_by<S: Offsetable>(msg: E, offset: &S, cause: Self) -> Self {
Error { Error {
err: err, msg: msg,
offset: offset.get_offset(), offset: offset.get_offset(),
cause: Some(Box::new(cause)), cause: Some(Box::new(cause)),
} }
} }
/// Returns the contained err. /// Returns the contained err.
pub fn get_err<'a>(&'a self) -> &'a E { pub fn get_msg<'a>(&'a self) -> &'a E {
&self.err &self.msg
} }
/// Returns `Some(cause)` if there is one, None otherwise. /// Returns `Some(cause)` if there is one, None otherwise.
@ -66,7 +66,7 @@ impl<E: Display + Debug> Error<E> {
impl<E: Display + Debug> Display for Error<E> { impl<E: Display + Debug> Display for Error<E> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::result::Result<(), std::fmt::Error> { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::result::Result<(), std::fmt::Error> {
try!(write!(f, "{}", self.err)); try!(write!(f, "{}", self.msg));
match self.cause { match self.cause {
Some(ref c) => write!(f, "\n\tCaused By:{}", c), Some(ref c) => write!(f, "\n\tCaused By:{}", c),
None => Ok(()), None => Ok(()),