actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-11-26 02:51:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix(config): Improve output from --dump-config

Browse source
This commit is contained in:
Ed Page 2021-04-07 20:49:30 -05:00
parent 8d02a86f2f
commit b8294d7afa
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/policy.rs
View file

@ -131,6 +131,26 @@ impl<'s> ConfigEngine<'s> {
config.update(overrides); config.update(overrides);
} }
let mut types = Default::default();
std::mem::swap(&mut types, &mut config.type_);
let mut types = types
.into_iter()
.map(|(type_, type_engine)| {
let mut new_engine = config.default.clone();
new_engine.update(&type_engine.engine);
new_engine.update(&config.overrides);
let new_type_engine = crate::config::TypeEngineConfig {
extend_glob: type_engine.extend_glob,
engine: new_engine,
};
(type_, new_type_engine)
})
.collect();
std::mem::swap(&mut types, &mut config.type_);
config.default.update(&config.overrides);
Ok(config) Ok(config)
} }
@ -167,10 +187,7 @@ impl<'s> ConfigEngine<'s> {
} }
} }
let mut new_type_engine = default.clone(); let type_config = self.init_file_config(type_engine.engine);
new_type_engine.update(&type_engine.engine);
new_type_engine.update(&overrides);
let type_config = self.init_file_config(new_type_engine);
types.insert(type_name, type_config); types.insert(type_name, type_config);
} }
default.update(&overrides); default.update(&overrides);