diff --git a/crates/core/src/matcher.rs b/crates/core/src/matcher.rs index b735557..33e715b 100644 --- a/crates/core/src/matcher.rs +++ b/crates/core/src/matcher.rs @@ -10,16 +10,16 @@ pub(crate) trait SourceMatcher { #[serde(tag = "type")] pub(crate) enum SourceMatcherEnum { #[serde(rename = "resource-name-keyword")] - ResourceNameKeywordMatcher(ResourceNameKeywordMatcher), + ResourceNameKeyword(ResourceNameKeywordMatcher), #[serde(rename = "resource-name-regexp")] - ResourceNameRegexpMatcher(ResourceNameRegexpMatcher), + ResourceNameRegexp(ResourceNameRegexpMatcher), } impl SourceMatcher for SourceMatcherEnum { fn matches(&self, source: &Source) -> bool { match self { - SourceMatcherEnum::ResourceNameKeywordMatcher(matcher) => matcher.matches(source), - SourceMatcherEnum::ResourceNameRegexpMatcher(matcher) => matcher.matches(source), + SourceMatcherEnum::ResourceNameKeyword(matcher) => matcher.matches(source), + SourceMatcherEnum::ResourceNameRegexp(matcher) => matcher.matches(source), } } } diff --git a/crates/core/src/processor.rs b/crates/core/src/processor.rs index 6ecad9f..486c045 100644 --- a/crates/core/src/processor.rs +++ b/crates/core/src/processor.rs @@ -12,22 +12,22 @@ pub(crate) trait SourceProcessorTrait { #[serde(tag = "type")] pub enum SourceProcessor { #[serde(rename = "insert-before")] - InsertBeforeProcessor(InsertBeforeProcessor), + InsertBefore(InsertBeforeProcessor), #[serde(rename = "insert-after")] - InsertAfterProcessor(InsertAfterProcessor), + InsertAfter(InsertAfterProcessor), #[serde(rename = "replace")] - ReplaceProcessor(ReplaceProcessor), + Replace(ReplaceProcessor), #[serde(rename = "replace-regexp")] - ReplaceRegexpProcessor(ReplaceRegexpProcessor), + ReplaceRegexp(ReplaceRegexpProcessor), } impl SourceProcessor { pub fn process<'a>(&self, source: &'a mut Source) -> Result<&'a mut Source, Error> { match self { - SourceProcessor::InsertBeforeProcessor(processor) => processor.process(source), - SourceProcessor::InsertAfterProcessor(processor) => processor.process(source), - SourceProcessor::ReplaceProcessor(processor) => processor.process(source), - SourceProcessor::ReplaceRegexpProcessor(processor) => processor.process(source), + SourceProcessor::InsertBefore(processor) => processor.process(source), + SourceProcessor::InsertAfter(processor) => processor.process(source), + SourceProcessor::Replace(processor) => processor.process(source), + SourceProcessor::ReplaceRegexp(processor) => processor.process(source), } } }