diff --git a/src/rules/flake8_tidy_imports/banned_api.rs b/src/rules/flake8_tidy_imports/banned_api.rs index 7a4a963ff1..e80f66765d 100644 --- a/src/rules/flake8_tidy_imports/banned_api.rs +++ b/src/rules/flake8_tidy_imports/banned_api.rs @@ -7,8 +7,11 @@ use crate::ast::types::Range; use crate::checkers::ast::Checker; use crate::define_violation; use crate::registry::Diagnostic; +use crate::settings::hashable::HashableHashMap; use crate::violation::Violation; +pub type Settings = HashableHashMap; + #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema)] #[serde(deny_unknown_fields, rename_all = "kebab-case")] pub struct ApiBan { diff --git a/src/rules/flake8_tidy_imports/mod.rs b/src/rules/flake8_tidy_imports/mod.rs index badaf0f7d5..35fec51a9a 100644 --- a/src/rules/flake8_tidy_imports/mod.rs +++ b/src/rules/flake8_tidy_imports/mod.rs @@ -1,7 +1,3 @@ -use self::banned_api::ApiBan; -use self::relative_imports::Strictness; -use crate::settings::hashable::HashableHashMap; - pub mod options; pub mod banned_api; @@ -9,6 +5,6 @@ pub mod relative_imports; #[derive(Debug, Hash, Default)] pub struct Settings { - pub ban_relative_imports: Strictness, - pub banned_api: HashableHashMap, + pub ban_relative_imports: relative_imports::Settings, + pub banned_api: banned_api::Settings, } diff --git a/src/rules/flake8_tidy_imports/relative_imports.rs b/src/rules/flake8_tidy_imports/relative_imports.rs index e2f5fc2074..d589bc66e5 100644 --- a/src/rules/flake8_tidy_imports/relative_imports.rs +++ b/src/rules/flake8_tidy_imports/relative_imports.rs @@ -7,6 +7,8 @@ use crate::define_violation; use crate::registry::Diagnostic; use crate::violation::Violation; +pub type Settings = Strictness; + #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema, Default)] #[serde(deny_unknown_fields, rename_all = "kebab-case")] pub enum Strictness {