diff --git a/src/flake8_to_ruff/converter.rs b/src/flake8_to_ruff/converter.rs index d57cf187a4..5269369058 100644 --- a/src/flake8_to_ruff/converter.rs +++ b/src/flake8_to_ruff/converter.rs @@ -93,7 +93,7 @@ pub fn convert( let mut flake8_errmsg = flake8_errmsg::settings::Options::default(); let mut flake8_pytest_style = flake8_pytest_style::settings::Options::default(); let mut flake8_quotes = flake8_quotes::settings::Options::default(); - let mut flake8_tidy_imports = flake8_tidy_imports::settings::Options::default(); + let mut flake8_tidy_imports = flake8_tidy_imports::options::Options::default(); let mut mccabe = mccabe::settings::Options::default(); let mut pep8_naming = pep8_naming::settings::Options::default(); let mut pydocstyle = pydocstyle::settings::Options::default(); @@ -354,7 +354,7 @@ pub fn convert( if flake8_quotes != flake8_quotes::settings::Options::default() { options.flake8_quotes = Some(flake8_quotes); } - if flake8_tidy_imports != flake8_tidy_imports::settings::Options::default() { + if flake8_tidy_imports != flake8_tidy_imports::options::Options::default() { options.flake8_tidy_imports = Some(flake8_tidy_imports); } if mccabe != mccabe::settings::Options::default() { diff --git a/src/lib_wasm.rs b/src/lib_wasm.rs index 943378ea60..eb9055fb17 100644 --- a/src/lib_wasm.rs +++ b/src/lib_wasm.rs @@ -123,7 +123,7 @@ pub fn defaultSettings() -> Result { flake8_errmsg: Some(flake8_errmsg::settings::Settings::default().into()), flake8_pytest_style: Some(flake8_pytest_style::settings::Settings::default().into()), flake8_quotes: Some(flake8_quotes::settings::Settings::default().into()), - flake8_tidy_imports: Some(flake8_tidy_imports::settings::Settings::default().into()), + flake8_tidy_imports: Some(flake8_tidy_imports::Settings::default().into()), flake8_import_conventions: Some( flake8_import_conventions::settings::Settings::default().into(), ), diff --git a/src/rules/flake8_tidy_imports/mod.rs b/src/rules/flake8_tidy_imports/mod.rs index b9ff184618..c3d1ca1837 100644 --- a/src/rules/flake8_tidy_imports/mod.rs +++ b/src/rules/flake8_tidy_imports/mod.rs @@ -1,6 +1,23 @@ -pub mod settings; +use self::banned_api::ApiBan; +use self::relative_imports::Strictness; +use crate::settings::hashable::HashableHashMap; + +pub mod options; pub mod banned_api; pub mod relative_imports; -use settings::Settings; +#[derive(Debug, Hash)] +pub struct Settings { + pub ban_relative_imports: Strictness, + pub banned_api: HashableHashMap, +} + +impl Default for Settings { + fn default() -> Self { + Self { + ban_relative_imports: Strictness::Parents, + banned_api: HashableHashMap::default(), + } + } +} diff --git a/src/rules/flake8_tidy_imports/settings.rs b/src/rules/flake8_tidy_imports/options.rs similarity index 83% rename from src/rules/flake8_tidy_imports/settings.rs rename to src/rules/flake8_tidy_imports/options.rs index b66df6b395..d2ad987c73 100644 --- a/src/rules/flake8_tidy_imports/settings.rs +++ b/src/rules/flake8_tidy_imports/options.rs @@ -1,7 +1,5 @@ //! Settings for the `flake8-tidy-imports` plugin. -use std::hash::Hash; - use ruff_macros::ConfigurationOptions; use rustc_hash::FxHashMap; use schemars::JsonSchema; @@ -9,7 +7,7 @@ use serde::{Deserialize, Serialize}; use super::banned_api::ApiBan; use super::relative_imports::Strictness; -use crate::settings::hashable::HashableHashMap; +use super::Settings; #[derive( Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema, @@ -46,21 +44,6 @@ pub struct Options { pub banned_api: Option>, } -#[derive(Debug, Hash)] -pub struct Settings { - pub ban_relative_imports: Strictness, - pub banned_api: HashableHashMap, -} - -impl Default for Settings { - fn default() -> Self { - Self { - ban_relative_imports: Strictness::Parents, - banned_api: HashableHashMap::default(), - } - } -} - impl From for Settings { fn from(options: Options) -> Self { Self { diff --git a/src/settings/configuration.rs b/src/settings/configuration.rs index 01d91208f9..6092e32c3c 100644 --- a/src/settings/configuration.rs +++ b/src/settings/configuration.rs @@ -65,7 +65,7 @@ pub struct Configuration { pub flake8_import_conventions: Option, pub flake8_pytest_style: Option, pub flake8_quotes: Option, - pub flake8_tidy_imports: Option, + pub flake8_tidy_imports: Option, pub flake8_unused_arguments: Option, pub isort: Option, pub mccabe: Option, diff --git a/src/settings/mod.rs b/src/settings/mod.rs index 70cec04578..80a3265824 100644 --- a/src/settings/mod.rs +++ b/src/settings/mod.rs @@ -109,7 +109,7 @@ pub struct Settings { pub flake8_import_conventions: flake8_import_conventions::settings::Settings, pub flake8_pytest_style: flake8_pytest_style::settings::Settings, pub flake8_quotes: flake8_quotes::settings::Settings, - pub flake8_tidy_imports: flake8_tidy_imports::settings::Settings, + pub flake8_tidy_imports: flake8_tidy_imports::Settings, pub flake8_unused_arguments: flake8_unused_arguments::settings::Settings, pub isort: isort::settings::Settings, pub mccabe: mccabe::settings::Settings, @@ -289,7 +289,7 @@ impl Settings { flake8_import_conventions: flake8_import_conventions::settings::Settings::default(), flake8_pytest_style: flake8_pytest_style::settings::Settings::default(), flake8_quotes: flake8_quotes::settings::Settings::default(), - flake8_tidy_imports: flake8_tidy_imports::settings::Settings::default(), + flake8_tidy_imports: flake8_tidy_imports::Settings::default(), flake8_unused_arguments: flake8_unused_arguments::settings::Settings::default(), isort: isort::settings::Settings::default(), mccabe: mccabe::settings::Settings::default(), @@ -332,7 +332,7 @@ impl Settings { flake8_import_conventions: flake8_import_conventions::settings::Settings::default(), flake8_pytest_style: flake8_pytest_style::settings::Settings::default(), flake8_quotes: flake8_quotes::settings::Settings::default(), - flake8_tidy_imports: flake8_tidy_imports::settings::Settings::default(), + flake8_tidy_imports: flake8_tidy_imports::Settings::default(), flake8_unused_arguments: flake8_unused_arguments::settings::Settings::default(), isort: isort::settings::Settings::default(), mccabe: mccabe::settings::Settings::default(), diff --git a/src/settings/options.rs b/src/settings/options.rs index 9acde76154..fcba305532 100644 --- a/src/settings/options.rs +++ b/src/settings/options.rs @@ -436,7 +436,7 @@ pub struct Options { pub flake8_quotes: Option, #[option_group] /// Options for the `flake8-tidy-imports` plugin. - pub flake8_tidy_imports: Option, + pub flake8_tidy_imports: Option, #[option_group] /// Options for the `flake8-import-conventions` plugin. pub flake8_import_conventions: Option, diff --git a/src/settings/pyproject.rs b/src/settings/pyproject.rs index 668c7b09f8..ae189c376e 100644 --- a/src/settings/pyproject.rs +++ b/src/settings/pyproject.rs @@ -575,7 +575,7 @@ other-attribute = 1 docstring_quotes: Some(Quote::Double), avoid_escape: Some(true), }), - flake8_tidy_imports: Some(flake8_tidy_imports::settings::Options { + flake8_tidy_imports: Some(flake8_tidy_imports::options::Options { ban_relative_imports: Some(Strictness::Parents), banned_api: Some(FxHashMap::from_iter([ (