refactor: Move flake8_tidy_imports Settings to mod.rs

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() {

src/lib_wasm.rs

@@ -123,7 +123,7 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         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(),
         ),

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<String, ApiBan>,
+}
+
+impl Default for Settings {
+    fn default() -> Self {
+        Self {
+            ban_relative_imports: Strictness::Parents,
+            banned_api: HashableHashMap::default(),
+        }
+    }
+}

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<FxHashMap<String, ApiBan>>,
 }
 
-#[derive(Debug, Hash)]
-pub struct Settings {
-    pub ban_relative_imports: Strictness,
-    pub banned_api: HashableHashMap<String, ApiBan>,
-}
-
-impl Default for Settings {
-    fn default() -> Self {
-        Self {
-            ban_relative_imports: Strictness::Parents,
-            banned_api: HashableHashMap::default(),
-        }
-    }
-}
-
 impl From<Options> for Settings {
     fn from(options: Options) -> Self {
         Self {

src/settings/configuration.rs

@@ -65,7 +65,7 @@ pub struct Configuration {
     pub flake8_import_conventions: Option<flake8_import_conventions::settings::Options>,
     pub flake8_pytest_style: Option<flake8_pytest_style::settings::Options>,
     pub flake8_quotes: Option<flake8_quotes::settings::Options>,
-    pub flake8_tidy_imports: Option<flake8_tidy_imports::settings::Options>,
+    pub flake8_tidy_imports: Option<flake8_tidy_imports::options::Options>,
     pub flake8_unused_arguments: Option<flake8_unused_arguments::settings::Options>,
     pub isort: Option<isort::settings::Options>,
     pub mccabe: Option<mccabe::settings::Options>,

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(),

src/settings/options.rs

@@ -436,7 +436,7 @@ pub struct Options {
     pub flake8_quotes: Option<flake8_quotes::settings::Options>,
     #[option_group]
     /// Options for the `flake8-tidy-imports` plugin.
-    pub flake8_tidy_imports: Option<flake8_tidy_imports::settings::Options>,
+    pub flake8_tidy_imports: Option<flake8_tidy_imports::options::Options>,
     #[option_group]
     /// Options for the `flake8-import-conventions` plugin.
     pub flake8_import_conventions: Option<flake8_import_conventions::settings::Options>,

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([
                         (