From 47b76481e51451827530714512b30882d85e3a9a Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 13 Jun 2026 01:36:41 +0200 Subject: chore(treewide): Also fix all `clippy` warnings --- crates/turtle/src/atuin_server/settings.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'crates/turtle/src/atuin_server/settings.rs') 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, #[serde(flatten)] + #[expect(clippy::struct_field_names)] pub(crate) db_settings: DbSettings, } impl Settings { pub(crate) fn new() -> Result { - 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"); -- cgit v1.3.1