This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new bea1b0a1ce chore: Upgrade Rust version to 1.90.0 (#17677)
bea1b0a1ce is described below
commit bea1b0a1ce325414ab9ed89a87df86d45f3d821c
Author: Rohan Krishnaswamy <[email protected]>
AuthorDate: Sun Sep 21 05:36:29 2025 -0700
chore: Upgrade Rust version to 1.90.0 (#17677)
* chore: bump workspace rust version to 1.90.0
* fix clippy errors
* fix clippy errors
* try using dedicate runner temp space
* retrigger
* inspect disk usage
* split build/run
* disable debug info in ci profile
* revert ci changes
---
Cargo.toml | 1 +
datafusion/core/tests/macro_hygiene/mod.rs | 1 +
datafusion/expr-common/src/statistics.rs | 2 +-
datafusion/ffi/src/udwf/partition_evaluator.rs | 2 +-
datafusion/functions-aggregate/src/average.rs | 4 ++--
datafusion/functions-aggregate/src/bit_and_or_xor.rs | 4 ++--
datafusion/functions-aggregate/src/sum.rs | 2 +-
datafusion/physical-expr/src/expressions/binary.rs | 2 +-
datafusion/physical-plan/src/joins/sort_merge_join/exec.rs | 8 ++++----
datafusion/physical-plan/src/limit.rs | 3 ++-
datafusion/spark/src/function/string/luhn_check.rs | 2 +-
rust-toolchain.toml | 2 +-
12 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index bbe21f9695..07cce25a86 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -199,6 +199,7 @@ rpath = false
strip = false # Retain debug info for flamegraphs
[profile.ci]
+debug = false
inherits = "dev"
incremental = false
diff --git a/datafusion/core/tests/macro_hygiene/mod.rs
b/datafusion/core/tests/macro_hygiene/mod.rs
index 09fb38b72e..c9f33f6fdf 100644
--- a/datafusion/core/tests/macro_hygiene/mod.rs
+++ b/datafusion/core/tests/macro_hygiene/mod.rs
@@ -73,6 +73,7 @@ mod config_field {
#[test]
fn test_macro() {
#[derive(Debug)]
+ #[allow(dead_code)]
struct E;
impl std::fmt::Display for E {
diff --git a/datafusion/expr-common/src/statistics.rs
b/datafusion/expr-common/src/statistics.rs
index 14f2f331ef..5c5e397e74 100644
--- a/datafusion/expr-common/src/statistics.rs
+++ b/datafusion/expr-common/src/statistics.rs
@@ -189,7 +189,7 @@ impl Distribution {
pub fn target_type(args: &[&ScalarValue]) -> Result<DataType> {
let mut arg_types = args
.iter()
- .filter(|&&arg| (arg != &ScalarValue::Null))
+ .filter(|&&arg| arg != &ScalarValue::Null)
.map(|&arg| arg.data_type());
let Some(dt) = arg_types.next().map_or_else(
diff --git a/datafusion/ffi/src/udwf/partition_evaluator.rs
b/datafusion/ffi/src/udwf/partition_evaluator.rs
index 995d00cce3..14cf23b919 100644
--- a/datafusion/ffi/src/udwf/partition_evaluator.rs
+++ b/datafusion/ffi/src/udwf/partition_evaluator.rs
@@ -86,7 +86,7 @@ pub struct PartitionEvaluatorPrivateData {
}
impl FFI_PartitionEvaluator {
- unsafe fn inner_mut(&mut self) -> &mut Box<(dyn PartitionEvaluator +
'static)> {
+ unsafe fn inner_mut(&mut self) -> &mut Box<dyn PartitionEvaluator +
'static> {
let private_data = self.private_data as *mut
PartitionEvaluatorPrivateData;
&mut (*private_data).evaluator
}
diff --git a/datafusion/functions-aggregate/src/average.rs
b/datafusion/functions-aggregate/src/average.rs
index a6a83c24b0..ba27499f48 100644
--- a/datafusion/functions-aggregate/src/average.rs
+++ b/datafusion/functions-aggregate/src/average.rs
@@ -528,7 +528,7 @@ impl<T: DecimalType + ArrowNumericType + Debug> Accumulator
for DecimalAvgAccumu
self.count += (values.len() - values.null_count()) as u64;
if let Some(x) = sum(values) {
- let v = self.sum.get_or_insert(T::Native::default());
+ let v = self.sum.get_or_insert_with(T::Native::default);
self.sum = Some(v.add_wrapping(x));
}
Ok(())
@@ -573,7 +573,7 @@ impl<T: DecimalType + ArrowNumericType + Debug> Accumulator
for DecimalAvgAccumu
// sums are summed
if let Some(x) = sum(states[1].as_primitive::<T>()) {
- let v = self.sum.get_or_insert(T::Native::default());
+ let v = self.sum.get_or_insert_with(T::Native::default);
self.sum = Some(v.add_wrapping(x));
}
Ok(())
diff --git a/datafusion/functions-aggregate/src/bit_and_or_xor.rs
b/datafusion/functions-aggregate/src/bit_and_or_xor.rs
index 7f0fd8e514..4926b248c0 100644
--- a/datafusion/functions-aggregate/src/bit_and_or_xor.rs
+++ b/datafusion/functions-aggregate/src/bit_and_or_xor.rs
@@ -382,7 +382,7 @@ where
{
fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
if let Some(x) = arrow::compute::bit_or(values[0].as_primitive::<T>())
{
- let v = self.value.get_or_insert(T::Native::usize_as(0));
+ let v = self.value.get_or_insert_with(|| T::Native::usize_as(0));
*v = *v | x;
}
Ok(())
@@ -427,7 +427,7 @@ where
{
fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
if let Some(x) =
arrow::compute::bit_xor(values[0].as_primitive::<T>()) {
- let v = self.value.get_or_insert(T::Native::usize_as(0));
+ let v = self.value.get_or_insert_with(|| T::Native::usize_as(0));
*v = *v ^ x;
}
Ok(())
diff --git a/datafusion/functions-aggregate/src/sum.rs
b/datafusion/functions-aggregate/src/sum.rs
index 04339fc645..4b7bf5260b 100644
--- a/datafusion/functions-aggregate/src/sum.rs
+++ b/datafusion/functions-aggregate/src/sum.rs
@@ -335,7 +335,7 @@ impl<T: ArrowNumericType> Accumulator for SumAccumulator<T>
{
fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
let values = values[0].as_primitive::<T>();
if let Some(x) = arrow::compute::sum(values) {
- let v = self.sum.get_or_insert(T::Native::usize_as(0));
+ let v = self.sum.get_or_insert_with(|| T::Native::usize_as(0));
*v = v.add_wrapping(x);
}
Ok(())
diff --git a/datafusion/physical-expr/src/expressions/binary.rs
b/datafusion/physical-expr/src/expressions/binary.rs
index 1f733d53e5..59fed88b14 100644
--- a/datafusion/physical-expr/src/expressions/binary.rs
+++ b/datafusion/physical-expr/src/expressions/binary.rs
@@ -160,7 +160,7 @@ fn boolean_op(
left: &dyn Array,
right: &dyn Array,
op: impl FnOnce(&BooleanArray, &BooleanArray) -> Result<BooleanArray,
ArrowError>,
-) -> Result<Arc<(dyn Array + 'static)>, ArrowError> {
+) -> Result<Arc<dyn Array + 'static>, ArrowError> {
let ll = as_boolean_array(left).expect("boolean_op failed to downcast left
array");
let rr = as_boolean_array(right).expect("boolean_op failed to downcast
right array");
op(ll, rr).map(|t| Arc::new(t) as _)
diff --git a/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs
b/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs
index 8330ec0900..592878a3bb 100644
--- a/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs
+++ b/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs
@@ -362,10 +362,10 @@ impl DisplayAs for SortMergeJoinExec {
"SortMergeJoin: join_type={:?}, on=[{}]{}{}",
self.join_type,
on,
- self.filter.as_ref().map_or("".to_string(), |f| format!(
- ", filter={}",
- f.expression()
- )),
+ self.filter.as_ref().map_or_else(
+ || "".to_string(),
+ |f| format!(", filter={}", f.expression())
+ ),
display_null_equality,
)
}
diff --git a/datafusion/physical-plan/src/limit.rs
b/datafusion/physical-plan/src/limit.rs
index 4611c547f2..6a0cae20e5 100644
--- a/datafusion/physical-plan/src/limit.rs
+++ b/datafusion/physical-plan/src/limit.rs
@@ -105,7 +105,8 @@ impl DisplayAs for GlobalLimitExec {
f,
"GlobalLimitExec: skip={}, fetch={}",
self.skip,
- self.fetch.map_or("None".to_string(), |x| x.to_string())
+ self.fetch
+ .map_or_else(|| "None".to_string(), |x| x.to_string())
)
}
DisplayFormatType::TreeRender => {
diff --git a/datafusion/spark/src/function/string/luhn_check.rs
b/datafusion/spark/src/function/string/luhn_check.rs
index 79b2a854f7..090b16e34b 100644
--- a/datafusion/spark/src/function/string/luhn_check.rs
+++ b/datafusion/spark/src/function/string/luhn_check.rs
@@ -149,5 +149,5 @@ fn luhn_check_impl(input: &str) -> bool {
alt = !alt;
}
- digits_processed > 0 && sum % 10 == 0
+ digits_processed > 0 && sum.is_multiple_of(10)
}
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 55d572362d..7697bc1c1e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -19,5 +19,5 @@
# to compile this workspace and run CI jobs.
[toolchain]
-channel = "1.89.0"
+channel = "1.90.0"
components = ["rustfmt", "clippy"]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
