From f5ddec0fb3f24f0ef810762cf3885fca597d2cc4 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Tue, 24 Jan 2023 06:29:00 +0100 Subject: [PATCH] refactor: Move resolve_select to converter module The function is only used there and is not plugin-specific since it also specifies the default rule selectors (F, E, W). --- src/flake8_to_ruff/converter.rs | 10 +++++++++- src/flake8_to_ruff/plugin.rs | 8 -------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/flake8_to_ruff/converter.rs b/src/flake8_to_ruff/converter.rs index 7b7a4619ba..35992d13ab 100644 --- a/src/flake8_to_ruff/converter.rs +++ b/src/flake8_to_ruff/converter.rs @@ -76,7 +76,7 @@ pub fn convert( .as_ref() .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value))) }) - .unwrap_or_else(|| plugin::resolve_select(&plugins)); + .unwrap_or_else(|| resolve_select(&plugins)); let mut ignore = flake8 .get("ignore") .and_then(|value| { @@ -406,6 +406,14 @@ pub fn convert( Ok(Pyproject::new(options)) } +/// Resolve the set of enabled `RuleSelector` values for the given +/// plugins. +fn resolve_select(plugins: &[Plugin]) -> BTreeSet { + let mut select = BTreeSet::from([RuleSelector::F, RuleSelector::E, RuleSelector::W]); + select.extend(plugins.iter().map(Plugin::selector)); + select +} + #[cfg(test)] mod tests { use std::collections::HashMap; diff --git a/src/flake8_to_ruff/plugin.rs b/src/flake8_to_ruff/plugin.rs index c2fb1c770e..9cd5cf0581 100644 --- a/src/flake8_to_ruff/plugin.rs +++ b/src/flake8_to_ruff/plugin.rs @@ -286,14 +286,6 @@ pub fn infer_plugins_from_codes(selectors: &BTreeSet) -> Vec BTreeSet { - let mut select = BTreeSet::from([RuleSelector::F, RuleSelector::E, RuleSelector::W]); - select.extend(plugins.iter().map(Plugin::selector)); - select -} - #[cfg(test)] mod tests { use std::collections::HashMap;