Skip to content

Commit fceae46

Browse files
Dandandanclaude
andauthored
chore: update Rust toolchain to 1.96.0 (#22611)
## Which issue does this PR close? <!-- No tracking issue; routine toolchain maintenance. --> - Closes #. ## Rationale for this change Keeps the pinned Rust toolchain current. This bumps the toolchain used to compile the workspace and run CI jobs from `1.95.0` to `1.96.0`. ## What changes are included in this PR? - `rust-toolchain.toml`: bump `channel` from `1.95.0` to `1.96.0`. - `docs/source/contributor-guide/development_environment.md`: update the `rustup component add --toolchain 1.96.0 rust-analyzer` example to match. The MSRV (`rust-version = "1.88.0"` in the workspace `Cargo.toml`) is unchanged. ## Are these changes tested? Covered by existing CI, which compiles and lints the workspace with the pinned toolchain. `cargo clippy --all-targets --all-features -- -D warnings` was run locally against 1.96.0. ## Are there any user-facing changes? No. This only affects the toolchain used by contributors and CI. --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent f46a4a4 commit fceae46

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

datafusion/sqllogictest/src/engines/postgres_engine/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ impl Postgres {
7575
///
7676
/// See https://docs.rs/tokio-postgres/latest/tokio_postgres/config/struct.Config.html#url for format
7777
pub async fn connect(relative_path: PathBuf, pb: ProgressBar) -> Result<Self> {
78-
let uri = std::env::var("PG_URI")
79-
.map_or_else(|_| PG_URI.to_string(), std::convert::identity);
78+
let uri = std::env::var("PG_URI").unwrap_or_else(|_| PG_URI.to_string());
8079

8180
info!("Using postgres connection string: {uri}");
8281

docs/source/contributor-guide/development_environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ DataFusion is written in Rust and it uses a standard rust toolkit:
108108

109109
- `rustup update stable` DataFusion generally uses the latest stable release of Rust, though it may lag when new Rust toolchains release
110110
- See which toolchain is currently pinned in the [`rust-toolchain.toml`](https://github.com/apache/datafusion/blob/main/rust-toolchain.toml) file
111-
- 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`
111+
- 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`
112112
- `cargo build`
113113
- `cargo fmt` to format the code
114114
- etc.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
# to compile this workspace and run CI jobs.
2020

2121
[toolchain]
22-
channel = "1.95.0"
22+
channel = "1.96.0"
2323
components = ["rustfmt", "clippy"]

0 commit comments

Comments
 (0)