This commit is contained in:
Paul Masurel
2017-05-15 22:30:18 +09:00
parent a23b7a1815
commit 4c8f9742f8
111 changed files with 2791 additions and 2888 deletions

View File

@@ -38,7 +38,7 @@ pub enum Error {
/// An Error appeared related to the lack of a field.
SchemaError(String),
/// Tried to access a fastfield reader for a field not configured accordingly.
FastFieldError(FastFieldNotAvailableError)
FastFieldError(FastFieldNotAvailableError),
}
impl From<FastFieldNotAvailableError> for Error {
@@ -83,10 +83,8 @@ impl From<schema::DocParsingError> for Error {
impl From<OpenWriteError> for Error {
fn from(error: OpenWriteError) -> Error {
match error {
OpenWriteError::FileAlreadyExists(filepath) =>
Error::FileAlreadyExists(filepath),
OpenWriteError::IOError(io_error) =>
Error::IOError(io_error),
OpenWriteError::FileAlreadyExists(filepath) => Error::FileAlreadyExists(filepath),
OpenWriteError::IOError(io_error) => Error::IOError(io_error),
}
}
}
@@ -94,10 +92,12 @@ impl From<OpenWriteError> for Error {
impl From<OpenDirectoryError> for Error {
fn from(error: OpenDirectoryError) -> Error {
match error {
OpenDirectoryError::DoesNotExist(directory_path) =>
Error::PathDoesNotExist(directory_path),
OpenDirectoryError::NotADirectory(directory_path) =>
Error::InvalidArgument(format!("{:?} is not a directory", directory_path)),
OpenDirectoryError::DoesNotExist(directory_path) => {
Error::PathDoesNotExist(directory_path)
}
OpenDirectoryError::NotADirectory(directory_path) => {
Error::InvalidArgument(format!("{:?} is not a directory", directory_path))
}
}
}
}
@@ -106,4 +106,4 @@ impl From<serde_json::Error> for Error {
fn from(error: serde_json::Error) -> Error {
Error::IOError(error.into())
}
}
}