Skip to content

Commit 5dd5ea5

Browse files
Merge pull request #144 from theseus-rs/update-rust-1.82
build: update to Rust 1.82.0
2 parents 344b478 + 1891582 commit 5dd5ea5

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

postgresql_embedded/src/settings.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use std::env;
88
use std::env::current_dir;
99
use std::ffi::OsString;
1010
use std::path::PathBuf;
11+
#[cfg(feature = "bundled")]
1112
use std::str::FromStr;
1213
#[cfg(feature = "bundled")]
1314
use std::sync::LazyLock;
@@ -156,19 +157,13 @@ impl Settings {
156157
settings.version = VersionReq::parse(version)?;
157158
}
158159
if let Some(installation_dir) = query_parameters.get("installation_dir") {
159-
if let Ok(path) = PathBuf::from_str(installation_dir) {
160-
settings.installation_dir = path;
161-
}
160+
settings.installation_dir = PathBuf::from(installation_dir);
162161
}
163162
if let Some(password_file) = query_parameters.get("password_file") {
164-
if let Ok(path) = PathBuf::from_str(password_file) {
165-
settings.password_file = path;
166-
}
163+
settings.password_file = PathBuf::from(password_file);
167164
}
168165
if let Some(data_dir) = query_parameters.get("data_dir") {
169-
if let Ok(path) = PathBuf::from_str(data_dir) {
170-
settings.data_dir = path;
171-
}
166+
settings.data_dir = PathBuf::from(data_dir);
172167
}
173168
if let Some(host) = parsed_url.host() {
174169
settings.host = host.to_string();

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.82.0"
33
profile = "default"

0 commit comments

Comments
 (0)