From 300bb6f6ac217ea6179646d71ee0d199f10727e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Heres?= Date: Fri, 29 May 2026 08:52:56 +0200 Subject: [PATCH 1/2] chore: update Rust toolchain to 1.96.0 Bump the pinned Rust toolchain from 1.95.0 to 1.96.0 in rust-toolchain.toml and update the matching rust-analyzer component example in the development environment docs. Co-Authored-By: Claude Opus 4.8 (1M context) --- docs/source/contributor-guide/development_environment.md | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/contributor-guide/development_environment.md b/docs/source/contributor-guide/development_environment.md index faffa29c9cf71..f18ab7e455f13 100644 --- a/docs/source/contributor-guide/development_environment.md +++ b/docs/source/contributor-guide/development_environment.md @@ -108,7 +108,7 @@ DataFusion is written in Rust and it uses a standard rust toolkit: - `rustup update stable` DataFusion generally uses the latest stable release of Rust, though it may lag when new Rust toolchains release - See which toolchain is currently pinned in the [`rust-toolchain.toml`](https://github.com/apache/datafusion/blob/main/rust-toolchain.toml) file - - This can cause issues such as not having the rust-analyzer component installed for the specified toolchain, in which case just install it manually, e.g. `rustup component add --toolchain 1.95.0 rust-analyzer` + - This can cause issues such as not having the rust-analyzer component installed for the specified toolchain, in which case just install it manually, e.g. `rustup component add --toolchain 1.96.0 rust-analyzer` - `cargo build` - `cargo fmt` to format the code - etc. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5df661d61cd6f..238458908f751 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -19,5 +19,5 @@ # to compile this workspace and run CI jobs. [toolchain] -channel = "1.95.0" +channel = "1.96.0" components = ["rustfmt", "clippy"] From f4a949de27d374493b6663e017f1524d224625f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Heres?= Date: Fri, 29 May 2026 09:00:23 +0200 Subject: [PATCH 2/2] chore: fix clippy::unnecessary_result_map_or_else for Rust 1.96 Rust 1.96's clippy adds the `unnecessary_result_map_or_else` lint, which fires on the `PG_URI` env lookup in the postgres sqllogictest engine. Replace `map_or_else(.., identity)` with `unwrap_or_else`. Co-Authored-By: Claude Opus 4.8 (1M context) --- datafusion/sqllogictest/src/engines/postgres_engine/mod.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datafusion/sqllogictest/src/engines/postgres_engine/mod.rs b/datafusion/sqllogictest/src/engines/postgres_engine/mod.rs index c3f266dcd1b62..f085fb5708875 100644 --- a/datafusion/sqllogictest/src/engines/postgres_engine/mod.rs +++ b/datafusion/sqllogictest/src/engines/postgres_engine/mod.rs @@ -75,8 +75,7 @@ impl Postgres { /// /// See https://docs.rs/tokio-postgres/latest/tokio_postgres/config/struct.Config.html#url for format pub async fn connect(relative_path: PathBuf, pb: ProgressBar) -> Result { - let uri = std::env::var("PG_URI") - .map_or_else(|_| PG_URI.to_string(), std::convert::identity); + let uri = std::env::var("PG_URI").unwrap_or_else(|_| PG_URI.to_string()); info!("Using postgres connection string: {uri}");