actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2025-01-11 01:01:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(config): Clarify config is not file-specific

Browse source 
This is prep for the config being reused in other contexts, like commit
messages.
This commit is contained in:
Ed Page 2021-03-01 20:40:21 -06:00
parent 4bbc59facf
commit f402d3ee77
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/args.rs
View file

@ -129,7 +129,7 @@ pub(crate) struct FileArgs {
pub(crate) locale: Option<config::Locale>, pub(crate) locale: Option<config::Locale>,
} }
impl config::FileSource for FileArgs { impl config::EngineSource for FileArgs {
fn binary(&self) -> Option<bool> { fn binary(&self) -> Option<bool> {
match (self.binary, self.no_binary) { match (self.binary, self.no_binary) {
(true, false) => Some(true), (true, false) => Some(true),

20
src/config.rs
View file

@ -5,7 +5,7 @@ pub trait ConfigSource {
None None
} }
fn default(&self) -> Option<&dyn FileSource> { fn default(&self) -> Option<&dyn EngineSource> {
None None
} }
} }
@ -42,7 +42,7 @@ pub trait WalkSource {
} }
} }
pub trait FileSource { pub trait EngineSource {
/// Check binary files. /// Check binary files.
fn binary(&self) -> Option<bool> { fn binary(&self) -> Option<bool> {
None None
@ -113,7 +113,7 @@ pub trait DictSource {
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub struct Config { pub struct Config {
pub files: Walk, pub files: Walk,
pub default: FileConfig, pub default: EngineConfig,
} }
impl Config { impl Config {
@ -130,7 +130,7 @@ impl Config {
pub fn from_defaults() -> Self { pub fn from_defaults() -> Self {
Self { Self {
files: Walk::from_defaults(), files: Walk::from_defaults(),
default: FileConfig::from_defaults(), default: EngineConfig::from_defaults(),
} }
} }
@ -157,7 +157,7 @@ impl ConfigSource for Config {
Some(&self.files) Some(&self.files)
} }
fn default(&self) -> Option<&dyn FileSource> { fn default(&self) -> Option<&dyn EngineSource> {
Some(&self.default) Some(&self.default)
} }
} }
@ -266,7 +266,7 @@ impl WalkSource for Walk {
#[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)] #[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
#[serde(deny_unknown_fields, default)] #[serde(deny_unknown_fields, default)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub struct FileConfig { pub struct EngineConfig {
pub binary: Option<bool>, pub binary: Option<bool>,
pub check_filename: Option<bool>, pub check_filename: Option<bool>,
pub check_file: Option<bool>, pub check_file: Option<bool>,
@ -276,10 +276,10 @@ pub struct FileConfig {
pub dict: Option<DictConfig>, pub dict: Option<DictConfig>,
} }
impl FileConfig { impl EngineConfig {
pub fn from_defaults() -> Self { pub fn from_defaults() -> Self {
let empty = Self::default(); let empty = Self::default();
FileConfig { EngineConfig {
binary: Some(empty.binary()), binary: Some(empty.binary()),
check_filename: Some(empty.check_filename()), check_filename: Some(empty.check_filename()),
check_file: Some(empty.check_file()), check_file: Some(empty.check_file()),
@ -292,7 +292,7 @@ impl FileConfig {
} }
} }
pub fn update(&mut self, source: &dyn FileSource) { pub fn update(&mut self, source: &dyn EngineSource) {
if let Some(source) = source.binary() { if let Some(source) = source.binary() {
self.binary = Some(source); self.binary = Some(source);
} }
@ -333,7 +333,7 @@ impl FileConfig {
} }
} }
impl FileSource for FileConfig { impl EngineSource for EngineConfig {
fn binary(&self) -> Option<bool> { fn binary(&self) -> Option<bool> {
self.binary self.binary
} }