From 04fe4d17dc488744879008f9a8e5cb9affefa2ec Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sat, 23 Nov 2024 20:20:51 -0700
Subject: [PATCH] refac: simplify config mechanism

---
 Cargo.lock                              |  2 +-
 src/alejandra/Cargo.toml                |  1 +
 src/alejandra/src/config.rs             | 12 +++---------
 src/alejandra_cli/Cargo.toml            |  1 -
 src/alejandra_cli/src/cli.rs            | 18 ++++++------------
 src/alejandra_cli/src/config_options.rs | 13 -------------
 src/alejandra_cli/src/lib.rs            |  1 -
 7 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 src/alejandra_cli/src/config_options.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9269c68..76a7443 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,6 +10,7 @@ dependencies = [
  "pretty_assertions",
  "rnix",
  "rowan",
+ "serde",
 ]
 
 [[package]]
@@ -21,7 +22,6 @@ dependencies = [
  "futures",
  "num_cpus",
  "rand",
- "serde",
  "serde_json",
  "walkdir",
 ]
diff --git a/src/alejandra/Cargo.toml b/src/alejandra/Cargo.toml
index 6e6eb7f..86386d9 100644
--- a/src/alejandra/Cargo.toml
+++ b/src/alejandra/Cargo.toml
@@ -2,6 +2,7 @@
 rnix = { version = "0.10.2", default-features = false, features = [] }
 # rowan follows rnix
 rowan = { version = "0.12.6", default-features = false, features = [] }
+serde = { version = "*", default-features = false, features = ["derive"] }
 
 [target.aarch64-unknown-linux-musl.dependencies.mimalloc]
 default-features = false
diff --git a/src/alejandra/src/config.rs b/src/alejandra/src/config.rs
index 5e659d3..1786994 100644
--- a/src/alejandra/src/config.rs
+++ b/src/alejandra/src/config.rs
@@ -1,11 +1,5 @@
+use serde::Deserialize;
+
 /// Configuration used by the formatter
-#[derive(Clone)]
+#[derive(Clone, Copy, Default, Deserialize)]
 pub struct Config {}
-
-use std::default::Default;
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {}
-    }
-}
diff --git a/src/alejandra_cli/Cargo.toml b/src/alejandra_cli/Cargo.toml
index 169d806..6ff6d4c 100644
--- a/src/alejandra_cli/Cargo.toml
+++ b/src/alejandra_cli/Cargo.toml
@@ -19,7 +19,6 @@ rand = { version = "*", default-features = false, features = [
   "alloc",
   "getrandom",
 ] }
-serde = { version = "*", default-features = false, features = ["derive"] }
 serde_json = { version = "*", default-features = false, features = ["std"] }
 walkdir = { version = "*", default-features = false, features = [] }
 
diff --git a/src/alejandra_cli/src/cli.rs b/src/alejandra_cli/src/cli.rs
index e9ca87b..26727de 100644
--- a/src/alejandra_cli/src/cli.rs
+++ b/src/alejandra_cli/src/cli.rs
@@ -10,7 +10,6 @@ use futures::stream::FuturesUnordered;
 use futures::task::SpawnExt;
 
 use crate::ads::random_ad;
-use crate::config_options::ConfigOptions;
 use crate::verbosity::Verbosity;
 
 /// The Uncompromising Nix Code Formatter.
@@ -110,8 +109,6 @@ fn format_paths(
     let futures: FuturesUnordered<RemoteHandle<FormattedPath>> = paths
         .into_iter()
         .map(|path| {
-            let config = config.clone();
-
             pool.spawn_with_handle(async move {
                 let status =
                     alejandra::format::in_fs(path.clone(), config, in_place);
@@ -253,15 +250,12 @@ fn resolve_config(path: Option<&str>, verbosity: Verbosity) -> Config {
             std::process::exit(1);
         });
 
-        let config_file = serde_json::from_str::<ConfigOptions>(&contents)
-            .unwrap_or_else(|error| {
-                if verbosity.allows_errors() {
-                    eprintln!("Errors found in config: {}", error);
-                }
-                std::process::exit(1);
-            });
-
-        config_file.into()
+        serde_json::from_str::<Config>(&contents).unwrap_or_else(|error| {
+            if verbosity.allows_errors() {
+                eprintln!("Errors found in config: {}", error);
+            }
+            std::process::exit(1);
+        })
     } else {
         Config::default()
     }
diff --git a/src/alejandra_cli/src/config_options.rs b/src/alejandra_cli/src/config_options.rs
deleted file mode 100644
index da283b7..0000000
--- a/src/alejandra_cli/src/config_options.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use alejandra::config::Config;
-use serde::Deserialize;
-
-#[derive(Deserialize)]
-pub(crate) struct ConfigOptions {}
-
-impl From<ConfigOptions> for Config {
-    fn from(_config_options: ConfigOptions) -> Config {
-        let config = Config::default();
-
-        config
-    }
-}
diff --git a/src/alejandra_cli/src/lib.rs b/src/alejandra_cli/src/lib.rs
index bbb9109..fd49ce8 100644
--- a/src/alejandra_cli/src/lib.rs
+++ b/src/alejandra_cli/src/lib.rs
@@ -1,5 +1,4 @@
 mod ads;
 pub mod cli;
-mod config_options;
 mod find;
 mod verbosity;