From fd880c6df3f5c61d857ca08c246bd7f2ea302633 Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Sat, 18 May 2024 14:05:36 -0400
Subject: [PATCH] Fix CI Clippy has all features enabled, including the flatpak
 flag

---
 crates/cli/src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index c2e7ce7d284f8..905443f68a01a 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -61,7 +61,7 @@ fn parse_path_with_position(
 
 fn main() -> Result<()> {
     // Exit flatpak sandbox
-    #[cfg(feature = "flatpak")]
+    #[cfg(all(feature = "flatpak", target_os = "linux"))]
     flatpak::restart_to_host();
 
     // Intercept version designators
@@ -279,7 +279,7 @@ mod linux {
     }
 }
 
-#[cfg(feature = "flatpak")]
+#[cfg(all(feature = "flatpak", target_os = "linux"))]
 mod flatpak {
     use std::ffi::OsString;
     use std::path::PathBuf;
@@ -329,7 +329,7 @@ mod flatpak {
     }
 
     fn get_xdg_env_args() -> Vec<OsString> {
-        let keep_keys = vec![
+        let keep_keys = [
             "XDG_DATA_HOME",
             "XDG_CONFIG_HOME",
             "XDG_CACHE_HOME",