Skip to content

Commit d3d0ba2

Browse files
committed
chore: Support Rust 1.88 (stable)
1 parent 8d4663b commit d3d0ba2

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,5 @@ rusty-tags.vi
9191

9292
.vscode
9393
venv/*
94+
.claude
95+
CLAUDE.md

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# under the License.
1717

1818
[workspace]
19+
resolver = "2"
1920
members = [
2021
"datafusion",
2122
"datafusion-cli",

datafusion/src/cube_ext/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ macro_rules! cube_match_scalar {
255255
ScalarValue::TimestampSecond(v) => ($matcher!($($arg ,)* v, TimestampSecondBuilder)),
256256
ScalarValue::IntervalYearMonth(v) => ($matcher!($($arg ,)* v, IntervalYearMonthBuilder)),
257257
ScalarValue::IntervalDayTime(v) => ($matcher!($($arg ,)* v, IntervalDayTimeBuilder)),
258-
ScalarValue::List(v, box dt) => ($matcher!($($arg ,)* v, dt, ListBuilder)),
258+
ScalarValue::List(v, dt) => ($matcher!($($arg ,)* v, &**dt, ListBuilder)),
259259
ScalarValue::Binary(v) => ($matcher!($($arg ,)* v, BinaryBuilder)),
260260
ScalarValue::LargeBinary(v) => ($matcher!($($arg ,)* v, LargeBinaryBuilder)),
261261
}

datafusion/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![feature(box_patterns)]
21
// Licensed to the Apache Software Foundation (ASF) under one
32
// or more contributor license agreements. See the NOTICE file
43
// distributed with this work for additional information

datafusion/src/physical_plan/hash_aggregate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,10 +1371,10 @@ pub(crate) fn append_value(b: &mut dyn ArrayBuilder, v: &ScalarValue) -> Result<
13711371
.expect("invalid list builder");
13721372
let vs = match $list {
13731373
None => return Ok(b.append(false)?),
1374-
Some(box vs) => vs,
1374+
Some(vs) => vs,
13751375
};
13761376
let values_builder = b.values();
1377-
for v in vs {
1377+
for v in &**vs {
13781378
append_value(values_builder, v)?;
13791379
}
13801380
Ok(b.append(true)?)

rust-toolchain.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[toolchain]
2+
channel = "1.88.0"
3+
components = ["rustfmt", "clippy"]
4+
profile = "minimal"

0 commit comments

Comments
 (0)