From b22a6db7e7ec4bae901fe4586ec771a8a3d9e8b3 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Fri, 23 Dec 2022 07:02:07 -0800 Subject: [PATCH] config: move default merge-tool config into config/ directory I'm about to add more default configs, so it will be good to collect them in one directory. --- src/config.rs | 6 +++--- src/{merge_tool_config.toml => config/merge_tools.toml} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename src/{merge_tool_config.toml => config/merge_tools.toml} (100%) diff --git a/src/config.rs b/src/config.rs index 40ea77769..512d3f40b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -72,12 +72,12 @@ fn env_base() -> config::Config { builder.build().unwrap() } -fn default_mergetool_config() -> config::Config { +fn default_config() -> config::Config { // Syntax error in default config isn't a user error. That's why defaults are // loaded by separate builder. config::Config::builder() .add_source(config::File::from_str( - include_str!("merge_tool_config.toml"), + include_str!("config/merge_tools.toml"), config::FileFormat::Toml, )) .build() @@ -113,7 +113,7 @@ fn env_overrides() -> config::Config { pub fn read_config() -> Result { let mut config_builder = config::Config::builder() - .add_source(default_mergetool_config()) + .add_source(default_config()) .add_source(env_base()); if let Some(config_path) = config_path()? { diff --git a/src/merge_tool_config.toml b/src/config/merge_tools.toml similarity index 100% rename from src/merge_tool_config.toml rename to src/config/merge_tools.toml