Apache DataFusion SQL Query Engine
chore: update Rust toolchain to 1.96.0 (#22611)
Daniël Heresfceae46d5945
diff --git a/datafusion/sqllogictest/src/engines/postgres_engine/mod.rs b/datafusion/sqllogictest/src/engines/postgres_engine/mod.rsindex c3f266dcd1..f085fb5708 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 formatpub async fn connect(relative_path: PathBuf, pb: ProgressBar) -> Result<Self> {- 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}");diff --git a/docs/source/contributor-guide/development_environment.md b/docs/source/contributor-guide/development_environment.mdindex faffa29c9c..f18ab7e455 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.tomlindex 5df661d61c..238458908f 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"]