summaryrefslogtreecommitdiffstats
path: root/src/config.rs
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2020-06-14 19:06:47 -0400
committerDan Davison <dandavison7@gmail.com>2020-06-14 19:06:47 -0400
commitae08bf2bea6b2f9316ef57fbd4940783f3c019ec (patch)
tree12b501855734ec371ac2887ba7d14f84b70ac3bb /src/config.rs
parenta836c1aca4df6a9edce6b6095887d0d630bfc3cd (diff)
Reorganize modules
Diffstat (limited to 'src/config.rs')
-rw-r--r--src/config.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/config.rs b/src/config.rs
index d10f0dcd..fc65b788 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -16,7 +16,8 @@ use crate::cli;
use crate::color;
use crate::delta::State;
use crate::env;
-use crate::rewrite;
+use crate::rewrite_options;
+use crate::set_options;
use crate::style::Style;
use crate::syntax_theme;
@@ -83,7 +84,8 @@ impl<'a> Config<'a> {
git_config: &mut Option<git2::Config>,
) -> Self {
let mut opt = cli::Opt::from_clap(&arg_matches);
- rewrite::apply_rewrite_rules(&mut opt, arg_matches, git_config);
+ set_options::set_options(&mut opt, git_config, &arg_matches);
+ rewrite_options::apply_rewrite_rules(&mut opt, &arg_matches);
Self::from(opt)
}