Skip to content

Minor: Use thiserror to implement the From trait for DFSqlLogicTestError #6924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Minor: Use thiserror to implement the From trait for DFSqlLogicTestError #6924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions datafusion/core/tests/sqllogictests/src/engines/datafusion/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,45 +28,21 @@ pub type Result<T, E = DFSqlLogicTestError> = std::result::Result<T, E>;
pub enum DFSqlLogicTestError {
/// Error from sqllogictest-rs
#[error("SqlLogicTest error(from sqllogictest-rs crate): {0}")]
SqlLogicTest(TestError),
SqlLogicTest(#[from] TestError),
/// Error from datafusion
#[error("DataFusion error: {0}")]
DataFusion(DataFusionError),
DataFusion(#[from] DataFusionError),
/// Error returned when SQL is syntactically incorrect.
#[error("SQL Parser error: {0}")]
Sql(ParserError),
Sql(#[from] ParserError),
/// Error from arrow-rs
#[error("Arrow error: {0}")]
Arrow(ArrowError),
Arrow(#[from] ArrowError),
/// Generic error
#[error("Other Error: {0}")]
Other(String),
}

impl From<TestError> for DFSqlLogicTestError {
fn from(value: TestError) -> Self {
DFSqlLogicTestError::SqlLogicTest(value)
}
}

impl From<DataFusionError> for DFSqlLogicTestError {
fn from(value: DataFusionError) -> Self {
DFSqlLogicTestError::DataFusion(value)
}
}

impl From<ParserError> for DFSqlLogicTestError {
fn from(value: ParserError) -> Self {
DFSqlLogicTestError::Sql(value)
}
}

impl From<ArrowError> for DFSqlLogicTestError {
fn from(value: ArrowError) -> Self {
DFSqlLogicTestError::Arrow(value)
}
}

impl From<String> for DFSqlLogicTestError {
fn from(value: String) -> Self {
DFSqlLogicTestError::Other(value)
Expand Down