support XDG_CONFIG_HOME for configuration file on macOS

Cargo.toml

@@ -40,7 +40,7 @@ cargo_metadata = "0.18"
 clap = { version = "4.4.2", features = ["derive"] }
 clap-cargo = "0.12.0"
 diff = "0.1"
-dirs = "5.0"
+etcetera = "0.8.0"
 getopts = "0.2"
 ignore = "0.4"
 itertools = "0.12"

Configurations.md

@@ -1,6 +1,6 @@
 # Configuring Rustfmt
 
-Rustfmt is designed to be very configurable. You can create a TOML file called `rustfmt.toml` or `.rustfmt.toml`, place it in the project or any other parent directory and it will apply the options in that file. If none of these directories contain such a file, both your home directory and a directory called `rustfmt` in your [global config directory](https://docs.rs/dirs/5.0.1/dirs/fn.config_dir.html) (e.g. `.config/rustfmt/`) are checked as well.
+Rustfmt is designed to be very configurable. You can create a TOML file called `rustfmt.toml` or `.rustfmt.toml`, place it in the project or any other parent directory and it will apply the options in that file. If none of these directories contain such a file, both your home directory and a directory called `rustfmt` in your global config directory (e.g. `.config/rustfmt/`) are checked as well.
 
 A possible content of `rustfmt.toml` or `.rustfmt.toml` might look like this:
 

src/config/mod.rs

@@ -4,6 +4,7 @@ use std::io::{Error, ErrorKind, Read};
 use std::path::{Path, PathBuf};
 use std::{env, fs};
 
+use etcetera::BaseStrategy;
 use thiserror::Error;
 
 use crate::config::config_type::ConfigType;
@@ -281,20 +282,28 @@ impl Config {
             }
 
             // If nothing was found, check in the home directory.
-            if let Some(home_dir) = dirs::home_dir() {
+            if let Ok(home_dir) = etcetera::home_dir() {
                 if let Some(path) = get_toml_path(&home_dir)? {
                     return Ok(Some(path));
                 }
             }
 
-            // If none was found there either, check in the user's configuration directory.
-            if let Some(mut config_dir) = dirs::config_dir() {
-                config_dir.push("rustfmt");
+            // If nothing was found there, check in the user's configuration directory.
+            if let Ok(strategy) = etcetera::base_strategy::choose_base_strategy() {
+                let config_dir = strategy.config_dir().join("rustfmt");
                 if let Some(path) = get_toml_path(&config_dir)? {
                     return Ok(Some(path));
                 }
             }
 
+            // If nothing was found there either, check the legacy configuration directory.
+            if let Ok(strategy) = etcetera::base_strategy::choose_native_strategy() {
+                let data_dir = strategy.data_dir().join("rustfmt");
+                if let Some(path) = get_toml_path(&data_dir)? {
+                    return Ok(Some(path));
+                }
+            }
+
             Ok(None)
         }