Remove feature gates and full move to XDG and etcetera

Author: deg4uss3r

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "confy"
-version = "1.0.0"
+version = "2.0.0"
 authors = ["Katharina Fey <[email protected]>"]
 description = "Boilerplate-free configuration management"
 license = "MIT/X11 OR Apache-2.0"
@@ -16,15 +16,14 @@ serde = "^1.0"
 serde_yaml = { version = "0.9", optional = true }
 thiserror = "2.0"
 basic-toml = { version = "0.1.10", optional = true }
-toml = { version = "0.8", optional = true }
+toml = { version = "0.9", optional = true }
 
 [features]
 default = ["toml_conf"]
 toml_conf = ["toml"]
 basic_toml_conf = ["basic-toml"]
 yaml_conf = ["serde_yaml"]
 ron_conf = ["ron"]
-xdg = []
 
 [[example]]
 name = "simple"

src/lib.rs

@@ -94,11 +94,7 @@
 mod utils;
 use utils::*;
 
-#[cfg(feature = "xdg")]
-use etcetera::app_strategy::choose_app_strategy;
-#[cfg(not(feature = "xdg"))]
-use etcetera::app_strategy::choose_native_strategy;
-use etcetera::{AppStrategy, AppStrategyArgs};
+use etcetera::{AppStrategy, AppStrategyArgs, app_strategy::choose_app_strategy};
 use serde::{Serialize, de::DeserializeOwned};
 use std::fs::{self, File, OpenOptions, Permissions};
 use std::io::{ErrorKind::NotFound, Write};
@@ -473,31 +469,14 @@ pub fn get_configuration_file_path<'a>(
     config_name: impl Into<Option<&'a str>>,
 ) -> Result<PathBuf, ConfyError> {
     let config_name = config_name.into().unwrap_or("default-config");
-    let project;
-
-    #[cfg(not(feature = "xdg"))]
-    {
-        project = choose_native_strategy(AppStrategyArgs {
-            top_level_domain: "rs".to_string(),
-            author: "".to_string(),
-            app_name: app_name.to_string(),
-        })
-        .map_err(|e| {
-            ConfyError::BadConfigDirectory(format!("could not determine home directory path: {e}"))
-        })?;
-    }
-
-    #[cfg(feature = "xdg")]
-    {
-        project = choose_app_strategy(AppStrategyArgs {
-            top_level_domain: "rs".to_string(),
-            author: "".to_string(),
-            app_name: app_name.to_string(),
-        })
-        .map_err(|e| {
-            ConfyError::BadConfigDirectory(format!("could not determine home directory path: {e}"))
-        })?;
-    }
+    let project = choose_app_strategy(AppStrategyArgs {
+        top_level_domain: "rs".to_string(),
+        author: "".to_string(),
+        app_name: app_name.to_string(),
+    })
+    .map_err(|e| {
+        ConfyError::BadConfigDirectory(format!("could not determine home directory path: {e}"))
+    })?;
 
     let config_dir_str = get_configuration_directory_str(&project)?;
 
@@ -509,13 +488,7 @@ pub fn get_configuration_file_path<'a>(
 }
 
 fn get_configuration_directory_str(project: &impl AppStrategy) -> Result<String, ConfyError> {
-    let path = if cfg!(feature = "xdg") {
-        project.config_dir()
-    } else {
-        project.data_dir()
-    };
-
-    Ok(format!("{}", path.display()))
+    Ok(project.config_dir().display().to_string())
 }
 
 #[cfg(test)]