Skip to content

Commit 50135e8

Browse files
authored
Use thiserror to implement the From trait for DFSqlLogicTestError (#6924)
1 parent e752a9c commit 50135e8

File tree

1 file changed

+4
-28
lines changed
  • datafusion/core/tests/sqllogictests/src/engines/datafusion

1 file changed

+4
-28
lines changed

datafusion/core/tests/sqllogictests/src/engines/datafusion/error.rs

+4-28
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,21 @@ pub type Result<T, E = DFSqlLogicTestError> = std::result::Result<T, E>;
2828
pub enum DFSqlLogicTestError {
2929
/// Error from sqllogictest-rs
3030
#[error("SqlLogicTest error(from sqllogictest-rs crate): {0}")]
31-
SqlLogicTest(TestError),
31+
SqlLogicTest(#[from] TestError),
3232
/// Error from datafusion
3333
#[error("DataFusion error: {0}")]
34-
DataFusion(DataFusionError),
34+
DataFusion(#[from] DataFusionError),
3535
/// Error returned when SQL is syntactically incorrect.
3636
#[error("SQL Parser error: {0}")]
37-
Sql(ParserError),
37+
Sql(#[from] ParserError),
3838
/// Error from arrow-rs
3939
#[error("Arrow error: {0}")]
40-
Arrow(ArrowError),
40+
Arrow(#[from] ArrowError),
4141
/// Generic error
4242
#[error("Other Error: {0}")]
4343
Other(String),
4444
}
4545

46-
impl From<TestError> for DFSqlLogicTestError {
47-
fn from(value: TestError) -> Self {
48-
DFSqlLogicTestError::SqlLogicTest(value)
49-
}
50-
}
51-
52-
impl From<DataFusionError> for DFSqlLogicTestError {
53-
fn from(value: DataFusionError) -> Self {
54-
DFSqlLogicTestError::DataFusion(value)
55-
}
56-
}
57-
58-
impl From<ParserError> for DFSqlLogicTestError {
59-
fn from(value: ParserError) -> Self {
60-
DFSqlLogicTestError::Sql(value)
61-
}
62-
}
63-
64-
impl From<ArrowError> for DFSqlLogicTestError {
65-
fn from(value: ArrowError) -> Self {
66-
DFSqlLogicTestError::Arrow(value)
67-
}
68-
}
69-
7046
impl From<String> for DFSqlLogicTestError {
7147
fn from(value: String) -> Self {
7248
DFSqlLogicTestError::Other(value)

0 commit comments

Comments
 (0)