diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-13 01:36:41 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-13 01:36:41 +0200 |
| commit | 47b76481e51451827530714512b30882d85e3a9a (patch) | |
| tree | 3e64edfa304e11e4dff506683dd0a7ea7929123e /crates/turtle/src/atuin_server/settings.rs | |
| parent | chore(treewide): Fix some of `clippy`'s error (diff) | |
| download | atuin-47b76481e51451827530714512b30882d85e3a9a.zip | |
chore(treewide): Also fix all `clippy` warnings
Diffstat (limited to 'crates/turtle/src/atuin_server/settings.rs')
| -rw-r--r-- | crates/turtle/src/atuin_server/settings.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/crates/turtle/src/atuin_server/settings.rs b/crates/turtle/src/atuin_server/settings.rs index 9424715d..1aa9059d 100644 --- a/crates/turtle/src/atuin_server/settings.rs +++ b/crates/turtle/src/atuin_server/settings.rs @@ -43,19 +43,21 @@ pub(crate) struct Settings { pub(crate) fake_version: Option<String>, #[serde(flatten)] + #[expect(clippy::struct_field_names)] pub(crate) db_settings: DbSettings, } impl Settings { pub(crate) fn new() -> Result<Self> { - let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") { - PathBuf::from(p) - } else { - let mut config_file = PathBuf::new(); - let config_dir = crate::atuin_common::utils::config_dir(); - config_file.push(config_dir); - config_file - }; + let mut config_file = std::env::var("ATUIN_CONFIG_DIR").map_or_else( + |_| { + let mut config_file = PathBuf::new(); + let config_dir = crate::atuin_common::utils::config_dir(); + config_file.push(config_dir); + config_file + }, + PathBuf::from, + ); config_file.push("server.toml"); |
