Skip to content

Commit 16f98ff

Browse files
authored
chore: update rust 2024 edition (#1371)
* Cargo fmt on rust 2024 * Update example to rust2024
1 parent 08a8dc0 commit 16f98ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+181
-139
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ authors = ["Apache DataFusion <dev@datafusion.apache.org>"]
2424
description = "Apache DataFusion DataFrame and SQL Query Engine"
2525
readme = "README.md"
2626
license = "Apache-2.0"
27-
edition = "2021"
28-
rust-version = "1.78"
27+
edition = "2024"
28+
rust-version = "1.88"
2929
include = [
3030
"/src",
3131
"/datafusion",

examples/datafusion-ffi-example/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[package]
1919
name = "datafusion-ffi-example"
2020
version = "0.2.0"
21-
edition = "2021"
21+
edition = "2024"
2222

2323
[dependencies]
2424
datafusion-catalog = { version = "52", default-features = false }

examples/datafusion-ffi-example/src/aggregate_udf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use datafusion_expr::{Accumulator, AggregateUDF, AggregateUDFImpl, Signature};
2525
use datafusion_ffi::udaf::FFI_AggregateUDF;
2626
use datafusion_functions_aggregate::sum::Sum;
2727
use pyo3::types::PyCapsule;
28-
use pyo3::{pyclass, pymethods, Bound, PyResult, Python};
28+
use pyo3::{Bound, PyResult, Python, pyclass, pymethods};
2929

3030
#[pyclass(name = "MySumUDF", module = "datafusion_ffi_example", subclass)]
3131
#[derive(Debug, Clone, Eq, PartialEq, Hash)]

examples/datafusion-ffi-example/src/catalog_provider.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use datafusion_ffi::catalog_provider::FFI_CatalogProvider;
3030
use datafusion_ffi::catalog_provider_list::FFI_CatalogProviderList;
3131
use datafusion_ffi::schema_provider::FFI_SchemaProvider;
3232
use pyo3::types::PyCapsule;
33-
use pyo3::{pyclass, pymethods, Bound, PyAny, PyResult, Python};
33+
use pyo3::{Bound, PyAny, PyResult, Python, pyclass, pymethods};
3434

3535
use crate::utils::ffi_logical_codec_from_pycapsule;
3636

examples/datafusion-ffi-example/src/scalar_udf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ use std::sync::Arc;
2020

2121
use arrow_array::{Array, BooleanArray};
2222
use arrow_schema::DataType;
23-
use datafusion_common::error::Result as DataFusionResult;
2423
use datafusion_common::ScalarValue;
24+
use datafusion_common::error::Result as DataFusionResult;
2525
use datafusion_expr::{
2626
ColumnarValue, ScalarFunctionArgs, ScalarUDF, ScalarUDFImpl, Signature, TypeSignature,
2727
Volatility,
2828
};
2929
use datafusion_ffi::udf::FFI_ScalarUDF;
3030
use pyo3::types::PyCapsule;
31-
use pyo3::{pyclass, pymethods, Bound, PyResult, Python};
31+
use pyo3::{Bound, PyResult, Python, pyclass, pymethods};
3232

3333
#[pyclass(name = "IsNullUDF", module = "datafusion_ffi_example", subclass)]
3434
#[derive(Debug, Clone, PartialEq, Eq, Hash)]

examples/datafusion-ffi-example/src/table_function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use datafusion_common::error::Result as DataFusionResult;
2222
use datafusion_expr::Expr;
2323
use datafusion_ffi::udtf::FFI_TableFunction;
2424
use pyo3::types::PyCapsule;
25-
use pyo3::{pyclass, pymethods, Bound, PyAny, PyResult, Python};
25+
use pyo3::{Bound, PyAny, PyResult, Python, pyclass, pymethods};
2626

2727
use crate::table_provider::MyTableProvider;
2828
use crate::utils::ffi_logical_codec_from_pycapsule;

examples/datafusion-ffi-example/src/table_provider.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use datafusion_common::error::{DataFusionError, Result as DataFusionResult};
2424
use datafusion_ffi::table_provider::FFI_TableProvider;
2525
use pyo3::exceptions::PyRuntimeError;
2626
use pyo3::types::PyCapsule;
27-
use pyo3::{pyclass, pymethods, Bound, PyAny, PyResult, Python};
27+
use pyo3::{Bound, PyAny, PyResult, Python, pyclass, pymethods};
2828

2929
use crate::utils::ffi_logical_codec_from_pycapsule;
3030

examples/datafusion-ffi-example/src/window_udf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use datafusion_expr::{PartitionEvaluator, Signature, WindowUDF, WindowUDFImpl};
2525
use datafusion_ffi::udwf::FFI_WindowUDF;
2626
use datafusion_functions_window::rank::rank_udwf;
2727
use pyo3::types::PyCapsule;
28-
use pyo3::{pyclass, pymethods, Bound, PyResult, Python};
28+
use pyo3::{Bound, PyResult, Python, pyclass, pymethods};
2929

3030
#[pyclass(name = "MyRankUDF", module = "datafusion_ffi_example", subclass)]
3131
#[derive(Debug, Clone, Eq, PartialEq, Hash)]

src/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use arrow::ffi::{FFI_ArrowArray, FFI_ArrowSchema};
2323
use arrow::pyarrow::ToPyArrow;
2424
use pyo3::prelude::{PyAnyMethods, PyCapsuleMethods};
2525
use pyo3::types::PyCapsule;
26-
use pyo3::{pyclass, pymethods, Bound, PyAny, PyResult, Python};
26+
use pyo3::{Bound, PyAny, PyResult, Python, pyclass, pymethods};
2727

2828
use crate::errors::PyDataFusionResult;
2929
use crate::utils::validate_pycapsule;

src/catalog.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ use datafusion::datasource::TableProvider;
2929
use datafusion_ffi::catalog_provider::FFI_CatalogProvider;
3030
use datafusion_ffi::proto::logical_extension_codec::FFI_LogicalExtensionCodec;
3131
use datafusion_ffi::schema_provider::FFI_SchemaProvider;
32+
use pyo3::IntoPyObjectExt;
3233
use pyo3::exceptions::PyKeyError;
3334
use pyo3::prelude::*;
3435
use pyo3::types::PyCapsule;
35-
use pyo3::IntoPyObjectExt;
3636

3737
use crate::dataset::Dataset;
38-
use crate::errors::{py_datafusion_err, to_datafusion_err, PyDataFusionError, PyDataFusionResult};
38+
use crate::errors::{PyDataFusionError, PyDataFusionResult, py_datafusion_err, to_datafusion_err};
3939
use crate::table::PyTable;
4040
use crate::utils::{
4141
create_logical_extension_capsule, extract_logical_extension_codec, validate_pycapsule,

0 commit comments

Comments
 (0)