Skip to content

Commit d749da7

Browse files
authored
Merge branch 'main' into simplify_not
2 parents ceb85ff + 96a5f21 commit d749da7

File tree

94 files changed

+2338
-641
lines changed

Some content is hidden

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

94 files changed

+2338
-641
lines changed

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@763e3324d4fd026c9bd284c504378585777a87d5 # v2.62.57
45+
uses: taiki-e/install-action@b4b80945859e8ef89a9732a0f46499a443b196fe # v2.62.59
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/rust.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
rust-version: stable
5757
- name: Rust Dependency Cache
58-
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
58+
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
5959
with:
6060
shared-key: "amd-ci-check" # this job uses it's own cache becase check has a separate cache and we need it to be fast as it blocks other jobs
6161
save-if: ${{ github.ref_name == 'main' }}
@@ -108,7 +108,7 @@ jobs:
108108
with:
109109
rust-version: stable
110110
- name: Rust Dependency Cache
111-
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
111+
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
112112
with:
113113
save-if: false # set in linux-test
114114
shared-key: "amd-ci"
@@ -176,7 +176,7 @@ jobs:
176176
with:
177177
rust-version: stable
178178
- name: Rust Dependency Cache
179-
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
179+
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
180180
with:
181181
save-if: false # set in linux-test
182182
shared-key: "amd-ci"
@@ -293,7 +293,7 @@ jobs:
293293
with:
294294
rust-version: stable
295295
- name: Rust Dependency Cache
296-
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
296+
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
297297
with:
298298
save-if: ${{ github.ref_name == 'main' }}
299299
shared-key: "amd-ci"
@@ -337,7 +337,7 @@ jobs:
337337
- name: Setup Rust toolchain
338338
run: rustup toolchain install stable
339339
- name: Rust Dependency Cache
340-
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
340+
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
341341
with:
342342
save-if: false # set in linux-test
343343
shared-key: "amd-ci"
@@ -370,7 +370,7 @@ jobs:
370370
with:
371371
rust-version: stable
372372
- name: Rust Dependency Cache
373-
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
373+
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
374374
with:
375375
save-if: ${{ github.ref_name == 'main' }}
376376
shared-key: "amd-ci-linux-test-example"
@@ -446,7 +446,7 @@ jobs:
446446
sudo apt-get update -qq
447447
sudo apt-get install -y -qq clang
448448
- name: Setup wasm-pack
449-
uses: taiki-e/install-action@763e3324d4fd026c9bd284c504378585777a87d5 # v2.62.57
449+
uses: taiki-e/install-action@b4b80945859e8ef89a9732a0f46499a443b196fe # v2.62.59
450450
with:
451451
tool: wasm-pack
452452
- name: Run tests with headless mode
@@ -677,7 +677,7 @@ jobs:
677677
- name: Install Clippy
678678
run: rustup component add clippy
679679
- name: Rust Dependency Cache
680-
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
680+
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
681681
with:
682682
save-if: ${{ github.ref_name == 'main' }}
683683
shared-key: "amd-ci-clippy"
@@ -749,7 +749,7 @@ jobs:
749749
- name: Setup Rust toolchain
750750
uses: ./.github/actions/setup-builder
751751
- name: Install cargo-msrv
752-
uses: taiki-e/install-action@763e3324d4fd026c9bd284c504378585777a87d5 # v2.62.57
752+
uses: taiki-e/install-action@b4b80945859e8ef89a9732a0f46499a443b196fe # v2.62.59
753753
with:
754754
tool: cargo-msrv
755755

@@ -794,4 +794,4 @@ jobs:
794794
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
795795
with:
796796
persist-credentials: false
797-
- uses: crate-ci/typos@626c4bedb751ce0b7f03262ca97ddda9a076ae1c # v1.39.2
797+
- uses: crate-ci/typos@2d0ce569feab1f8752f1dde43cc2f2aa53236e06 # v1.40.0

datafusion/catalog/src/information_schema.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ struct InformationSchemaRoutinesBuilder {
11671167
}
11681168

11691169
impl InformationSchemaRoutinesBuilder {
1170-
#[allow(clippy::too_many_arguments)]
1170+
#[expect(clippy::too_many_arguments)]
11711171
fn add_routine(
11721172
&mut self,
11731173
catalog_name: impl AsRef<str>,
@@ -1301,7 +1301,7 @@ struct InformationSchemaParametersBuilder {
13011301
}
13021302

13031303
impl InformationSchemaParametersBuilder {
1304-
#[allow(clippy::too_many_arguments)]
1304+
#[expect(clippy::too_many_arguments)]
13051305
fn add_parameter(
13061306
&mut self,
13071307
specific_catalog: impl AsRef<str>,

datafusion/catalog/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#![cfg_attr(not(test), deny(clippy::clone_on_ref_ptr))]
2626
#![deny(clippy::needless_pass_by_value)]
2727
#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
28+
#![deny(clippy::allow_attributes)]
2829

2930
//! Interfaces and default implementations of catalogs and schemas.
3031
//!

datafusion/catalog/src/schema.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub trait SchemaProvider: Debug + Sync + Send {
6868
///
6969
/// If a table of the same name was already registered, returns "Table
7070
/// already exists" error.
71-
#[allow(unused_variables)]
71+
#[expect(unused_variables)]
7272
fn register_table(
7373
&self,
7474
name: String,
@@ -81,7 +81,7 @@ pub trait SchemaProvider: Debug + Sync + Send {
8181
/// schema and returns the previously registered [`TableProvider`], if any.
8282
///
8383
/// If no `name` table exists, returns Ok(None).
84-
#[allow(unused_variables)]
84+
#[expect(unused_variables)]
8585
fn deregister_table(&self, name: &str) -> Result<Option<Arc<dyn TableProvider>>> {
8686
exec_err!("schema provider does not support deregistering tables")
8787
}

datafusion/common-runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ description = "Common Runtime functionality for DataFusion query engine"
2121
keywords = ["arrow", "query", "sql"]
2222
readme = "README.md"
2323
version = { workspace = true }
24-
edition = { workspace = true }
24+
edition = "2024"
2525
homepage = { workspace = true }
2626
repository = { workspace = true }
2727
license = { workspace = true }

datafusion/common-runtime/src/common.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl<R: 'static> SpawnedTask<R> {
4444
R: Send,
4545
{
4646
// Ok to use spawn here as SpawnedTask handles aborting/cancelling the task on Drop
47-
#[allow(clippy::disallowed_methods)]
47+
#[expect(clippy::disallowed_methods)]
4848
let inner = tokio::task::spawn(trace_future(task));
4949
Self { inner }
5050
}
@@ -56,7 +56,7 @@ impl<R: 'static> SpawnedTask<R> {
5656
R: Send,
5757
{
5858
// Ok to use spawn_blocking here as SpawnedTask handles aborting/cancelling the task on Drop
59-
#[allow(clippy::disallowed_methods)]
59+
#[expect(clippy::disallowed_methods)]
6060
let inner = tokio::task::spawn_blocking(trace_block(task));
6161
Self { inner }
6262
}
@@ -115,14 +115,14 @@ impl<R> Drop for SpawnedTask<R> {
115115
mod tests {
116116
use super::*;
117117

118-
use std::future::{pending, Pending};
118+
use std::future::{Pending, pending};
119119

120120
use tokio::{runtime::Runtime, sync::oneshot};
121121

122122
#[tokio::test]
123123
async fn runtime_shutdown() {
124124
let rt = Runtime::new().unwrap();
125-
#[allow(clippy::async_yields_async)]
125+
#[expect(clippy::async_yields_async)]
126126
let task = rt
127127
.spawn(async {
128128
SpawnedTask::spawn(async {

datafusion/common-runtime/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
// https://github.com/apache/datafusion/issues/18503
1919
#![deny(clippy::needless_pass_by_value)]
2020
#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
21+
#![deny(clippy::allow_attributes)]
2122
#![doc(
2223
html_logo_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg",
2324
html_favicon_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg"
@@ -34,5 +35,5 @@ mod trace_utils;
3435
pub use common::SpawnedTask;
3536
pub use join_set::JoinSet;
3637
pub use trace_utils::{
37-
set_join_set_tracer, trace_block, trace_future, JoinSetTracer, JoinSetTracerError,
38+
JoinSetTracer, JoinSetTracerError, set_join_set_tracer, trace_block, trace_future,
3839
};

datafusion/common-runtime/src/trace_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
use futures::future::BoxFuture;
1918
use futures::FutureExt;
19+
use futures::future::BoxFuture;
2020
use std::any::Any;
2121
use std::error::Error;
2222
use std::fmt::{Display, Formatter, Result as FmtResult};

datafusion/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ description = "Common functionality for DataFusion query engine"
2121
keywords = ["arrow", "query", "sql"]
2222
readme = "README.md"
2323
version = { workspace = true }
24-
edition = { workspace = true }
24+
edition = "2024"
2525
homepage = { workspace = true }
2626
repository = { workspace = true }
2727
license = { workspace = true }

0 commit comments

Comments
 (0)