Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions datafusion/sqllogictest/src/engines/postgres_engine/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<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}");

Expand Down
2 changes: 1 addition & 1 deletion docs/source/contributor-guide/development_environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
# to compile this workspace and run CI jobs.

[toolchain]
channel = "1.95.0"
channel = "1.96.0"
components = ["rustfmt", "clippy"]
Loading