decouple construction of Config from ConfigLoader

Author: pickx

src/application.rs

@@ -9,7 +9,7 @@ pub(crate) use crate::application::app_data::AppData;
 use crate::{
 	Args,
 	Exit,
-	config::{Config, ConfigLoader, DiffIgnoreWhitespaceSetting},
+	config::{Config, ConfigError, ConfigErrorCause, ConfigLoader, DiffIgnoreWhitespaceSetting},
 	diff::{self, CommitDiffLoader, CommitDiffLoaderOptions},
 	display::Display,
 	git::open_repository_from_env,
@@ -42,7 +42,8 @@ where ModuleProvider: module::ModuleProvider + Send + 'static
 		let filepath = Self::filepath_from_args(args)?;
 		let repository = Self::open_repository()?;
 		let config_loader = ConfigLoader::from(repository);
-		let config = Self::load_config(&config_loader)?;
+		let config = Self::load_config(&config_loader)
+			.map_err(|err| Exit::new(ExitStatus::ConfigError, format!("{err:#}").as_str()))?;
 		let todo_file = Arc::new(Mutex::new(Self::load_todo_file(filepath.as_str(), &config)?));
 
 		let display = Display::new(tui, &config.theme);
@@ -162,8 +163,11 @@ where ModuleProvider: module::ModuleProvider + Send + 'static
 		})
 	}
 
-	fn load_config(config_loader: &ConfigLoader) -> Result<Config, Exit> {
-		Config::try_from(config_loader).map_err(|err| Exit::new(ExitStatus::ConfigError, format!("{err:#}").as_str()))
+	fn load_config(config_loader: &ConfigLoader) -> Result<Config, ConfigError> {
+		let config = config_loader
+			.load_config()
+			.map_err(|e| ConfigError::new_read_error("", ConfigErrorCause::GitError(e)))?;
+		Config::new_with_config(Some(&config))
 	}
 
 	fn todo_file_options(config: &Config) -> TodoFileOptions {

src/config.rs

@@ -23,14 +23,12 @@ pub(crate) use self::{
 	config_loader::ConfigLoader,
 	diff_ignore_whitespace_setting::DiffIgnoreWhitespaceSetting,
 	diff_show_whitespace_setting::DiffShowWhitespaceSetting,
+	errors::{ConfigError, ConfigErrorCause, InvalidColorError},
 	git_config::GitConfig,
 	key_bindings::KeyBindings,
 	theme::Theme,
 };
-use crate::config::{
-	errors::{ConfigError, ConfigErrorCause, InvalidColorError},
-	utils::get_optional_string,
-};
+use crate::config::utils::get_optional_string;
 
 const DEFAULT_SPACE_SYMBOL: &str = "\u{b7}"; // ·
 const DEFAULT_TAB_SYMBOL: &str = "\u{2192}"; // →
@@ -94,22 +92,6 @@ impl Config {
 	}
 }
 
-impl TryFrom<&ConfigLoader> for Config {
-	type Error = ConfigError;
-
-	/// Creates a new Config instance loading the Git Config.
-	///
-	/// # Errors
-	///
-	/// Will return an `Err` if there is a problem loading the configuration.
-	fn try_from(config_loader: &ConfigLoader) -> Result<Self, Self::Error> {
-		let config = config_loader
-			.load_config()
-			.map_err(|e| ConfigError::new_read_error("", ConfigErrorCause::GitError(e)))?;
-		Self::new_with_config(Some(&config))
-	}
-}
-
 impl TryFrom<&crate::git::Config> for Config {
 	type Error = ConfigError;
 
@@ -132,7 +114,8 @@ mod tests {
 	fn try_from_config_loader() {
 		with_temp_bare_repository(|repository| {
 			let loader = ConfigLoader::from(repository);
-			assert_ok!(Config::try_from(&loader));
+			let config = assert_ok!(loader.load_config());
+			assert_ok!(Config::try_from(&config));
 		});
 	}