Run clippy in CI

Author: Ortham

.github/workflows/ci.yml

@@ -17,6 +17,16 @@ jobs:
           cargo fmt -- --version
           cargo fmt --all -- --check
 
+  clippy:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run clippy
+        run: |
+          cargo clippy -- --version
+          cargo clippy --all --all-targets -- -Dwarnings
+
   build:
     strategy:
       matrix:

src/game_settings.rs

@@ -343,7 +343,7 @@ fn local_path(game_id: GameId, game_path: &Path) -> Result<Option<PathBuf>, Erro
 #[cfg(not(windows))]
 fn local_path(game_id: GameId, game_path: &Path) -> Result<Option<PathBuf>, Error> {
     if game_id == GameId::OpenMW {
-        return openmw_config::user_config_dir(game_path).map(Some);
+        openmw_config::user_config_dir(game_path).map(Some)
     } else if appdata_folder_name(game_id, game_path).is_none() {
         // There is no local path, the value doesn't matter.
         Ok(None)

src/ini.rs

@@ -260,6 +260,7 @@ fn get_windows_system_language() -> Result<Option<String>, Error> {
 }
 
 #[cfg(not(windows))]
+#[expect(clippy::unnecessary_wraps, reason = "To match the Windows function signature")]
 fn get_windows_system_language() -> Result<Option<String>, Error> {
     Ok(None)
 }

src/openmw_config.rs

@@ -110,7 +110,7 @@ fn default_user_config_dir(game_path: &Path) -> Result<PathBuf, Error> {
         // as part of a Flatpak app.
         std::env::var_os("HOST_XDG_CONFIG_HOME")
             .and_then(is_absolute_path)
-            .or_else(|| dirs::config_dir())
+            .or_else(dirs::config_dir)
             .map(|p| p.join("openmw"))
     }
     .ok_or_else(|| Error::NoUserConfigPath)
@@ -126,7 +126,7 @@ fn default_user_data_dir(is_flatpak_install: bool) -> Result<PathBuf, Error> {
         // running as part of a Flatpak app.
         std::env::var_os("HOST_XDG_DATA_HOME")
             .and_then(is_absolute_path)
-            .or_else(|| dirs::data_local_dir())
+            .or_else(dirs::data_local_dir)
             .map(|p| p.join("openmw"))
     }
     .ok_or_else(|| Error::NoUserDataPath)
@@ -235,11 +235,7 @@ fn default_global_data_dir(game_path: &Path) -> PathBuf {
 #[cfg(not(windows))]
 fn is_absolute_path(value: OsString) -> Option<PathBuf> {
     let path = PathBuf::from(value);
-    if path.is_absolute() {
-        Some(path)
-    } else {
-        None
-    }
+    path.is_absolute().then_some(path)
 }
 
 #[cfg(not(windows))]