Skip to content

Commit 71f1fde

Browse files
committed
rebase_main
1 parent de389be commit 71f1fde

12 files changed

Lines changed: 14 additions & 17 deletions

datafusion/ffi/src/config/extension_options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use stabby::string::String as SString;
2727
use stabby::vec::Vec as SVec;
2828

2929
use crate::df_result;
30-
use crate::util::{FFIResult};
30+
use crate::util::FFIResult;
3131

3232
/// A stable struct for sharing [`ExtensionOptions`] across FFI boundaries.
3333
///

datafusion/ffi/src/physical_optimizer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use tokio::runtime::Handle;
2828

2929
use crate::config::FFI_ConfigOptions;
3030
use crate::execution_plan::FFI_ExecutionPlan;
31-
use crate::util::{FFIResult};
31+
use crate::util::FFIResult;
3232
use crate::{df_result, sresult_return};
3333

3434
/// A stable struct for sharing [`PhysicalOptimizerRule`] across FFI boundaries.

datafusion/ffi/src/proto/logical_extension_codec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ use crate::table_provider::FFI_TableProvider;
4444
use crate::udaf::FFI_AggregateUDF;
4545
use crate::udf::FFI_ScalarUDF;
4646
use crate::udwf::FFI_WindowUDF;
47-
use crate::util::{FFIResult};
47+
use crate::util::FFIResult;
4848
use crate::{df_result, sresult_return};
4949

5050
/// A stable struct for sharing [`LogicalExtensionCodec`] across FFI boundaries.

datafusion/ffi/src/proto/physical_extension_codec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use crate::execution_plan::FFI_ExecutionPlan;
3737
use crate::udaf::FFI_AggregateUDF;
3838
use crate::udf::FFI_ScalarUDF;
3939
use crate::udwf::FFI_WindowUDF;
40-
use crate::util::{FFIResult};
40+
use crate::util::FFIResult;
4141
use crate::{df_result, sresult_return};
4242

4343
/// A stable struct for sharing [`PhysicalExtensionCodec`] across FFI boundaries.

datafusion/ffi/src/session/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ use crate::session::config::FFI_SessionConfig;
5959
use crate::udaf::FFI_AggregateUDF;
6060
use crate::udf::FFI_ScalarUDF;
6161
use crate::udwf::FFI_WindowUDF;
62-
use crate::util::{FFIResult};
62+
use crate::util::FFIResult;
6363
use crate::{df_result, sresult, sresult_return};
6464

6565
pub mod config;

datafusion/ffi/src/table_provider_factory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use crate::execution::FFI_TaskContextProvider;
3636
use crate::proto::logical_extension_codec::FFI_LogicalExtensionCodec;
3737
use crate::session::{FFI_SessionRef, ForeignSession};
3838
use crate::table_provider::{FFI_TableProvider, ForeignTableProvider};
39-
use crate::util::{FFIResult};
39+
use crate::util::FFIResult;
4040
use crate::{df_result, sresult_return};
4141

4242
/// A stable struct for sharing [`TableProviderFactory`] across FFI boundaries.

datafusion/ffi/src/udaf/accumulator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use prost::Message;
3030
use stabby::vec::Vec as SVec;
3131

3232
use crate::arrow_wrappers::WrappedArray;
33-
use crate::util::{FFIResult};
33+
use crate::util::FFIResult;
3434
use crate::{df_result, sresult, sresult_return};
3535

3636
/// A stable struct for sharing [`Accumulator`] across FFI boundaries.

datafusion/ffi/src/udaf/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ use std::sync::Arc;
4343

4444
use crate::arrow_wrappers::WrappedSchema;
4545
use crate::util::{
46-
FFI_Option, FFIResult, rvec_wrapped_to_vec_datatype,
47-
rvec_wrapped_to_vec_fieldref, vec_datatype_to_rvec_wrapped,
48-
vec_fieldref_to_rvec_wrapped,
46+
FFI_Option, FFIResult, rvec_wrapped_to_vec_datatype, rvec_wrapped_to_vec_fieldref,
47+
vec_datatype_to_rvec_wrapped, vec_fieldref_to_rvec_wrapped,
4948
};
5049
use crate::volatility::FFI_Volatility;
5150
use crate::{df_result, sresult, sresult_return};

datafusion/ffi/src/udtf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use tokio::runtime::Handle;
3737
use crate::execution::FFI_TaskContextProvider;
3838
use crate::proto::logical_extension_codec::FFI_LogicalExtensionCodec;
3939
use crate::table_provider::FFI_TableProvider;
40-
use crate::util::{FFIResult};
40+
use crate::util::FFIResult;
4141
use crate::{df_result, sresult_return};
4242

4343
/// A stable struct for sharing a [`TableFunctionImpl`] across FFI boundaries.

datafusion/ffi/src/udwf/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ mod range;
4343

4444
use crate::arrow_wrappers::WrappedSchema;
4545
use crate::util::{
46-
FFI_Option, FFIResult, rvec_wrapped_to_vec_datatype,
47-
rvec_wrapped_to_vec_fieldref, vec_datatype_to_rvec_wrapped,
48-
vec_fieldref_to_rvec_wrapped,
46+
FFI_Option, FFIResult, rvec_wrapped_to_vec_datatype, rvec_wrapped_to_vec_fieldref,
47+
vec_datatype_to_rvec_wrapped, vec_fieldref_to_rvec_wrapped,
4948
};
5049
use crate::volatility::FFI_Volatility;
5150
use crate::{df_result, sresult, sresult_return};

0 commit comments

Comments
 (0)