From 00391d0589ea7c672132b91cff6518c8af33f723 Mon Sep 17 00:00:00 2001 From: jonahgao Date: Wed, 12 Jul 2023 12:56:10 +0800 Subject: [PATCH] Use thiserror to implement the From trait for DFSqlLogicTestError --- .../src/engines/datafusion/error.rs | 32 +++---------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/datafusion/core/tests/sqllogictests/src/engines/datafusion/error.rs b/datafusion/core/tests/sqllogictests/src/engines/datafusion/error.rs index ed6d1eda17c3..5bb40aca2ab8 100644 --- a/datafusion/core/tests/sqllogictests/src/engines/datafusion/error.rs +++ b/datafusion/core/tests/sqllogictests/src/engines/datafusion/error.rs @@ -28,45 +28,21 @@ pub type Result = std::result::Result; 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 for DFSqlLogicTestError { - fn from(value: TestError) -> Self { - DFSqlLogicTestError::SqlLogicTest(value) - } -} - -impl From for DFSqlLogicTestError { - fn from(value: DataFusionError) -> Self { - DFSqlLogicTestError::DataFusion(value) - } -} - -impl From for DFSqlLogicTestError { - fn from(value: ParserError) -> Self { - DFSqlLogicTestError::Sql(value) - } -} - -impl From for DFSqlLogicTestError { - fn from(value: ArrowError) -> Self { - DFSqlLogicTestError::Arrow(value) - } -} - impl From for DFSqlLogicTestError { fn from(value: String) -> Self { DFSqlLogicTestError::Other(value)