diff --git a/ruff.schema.json b/ruff.schema.json index 79ba54e760..f55b62f279 100644 --- a/ruff.schema.json +++ b/ruff.schema.json @@ -981,7 +981,7 @@ "description": "Whether to place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local), or vice versa.\n\nThe default (\"furthest-to-closest\") is equivalent to isort's `reverse-relative` default (`reverse-relative = false`); setting this to \"closest-to-furthest\" is equivalent to isort's `reverse-relative = true`.", "anyOf": [ { - "$ref": "#/definitions/RelatveImportsOrder" + "$ref": "#/definitions/RelativeImportsOrder" }, { "type": "null" @@ -1197,7 +1197,7 @@ } ] }, - "RelatveImportsOrder": { + "RelativeImportsOrder": { "oneOf": [ { "description": "Place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local).", diff --git a/src/rules/isort/mod.rs b/src/rules/isort/mod.rs index bca6b7f6e1..1105e406e1 100644 --- a/src/rules/isort/mod.rs +++ b/src/rules/isort/mod.rs @@ -10,7 +10,7 @@ use itertools::Either::{Left, Right}; use itertools::Itertools; use rustc_hash::FxHashMap; use rustpython_ast::{Stmt, StmtKind}; -use settings::RelatveImportsOrder; +use settings::RelativeImportsOrder; use sorting::{cmp_either_import, cmp_import_from, cmp_members, cmp_modules}; use track::{Block, Trailer}; use types::EitherImport::{Import, ImportFrom}; @@ -386,7 +386,7 @@ fn categorize_imports<'a>( fn order_imports<'a>( block: ImportBlock<'a>, order_by_type: bool, - relative_imports_order: RelatveImportsOrder, + relative_imports_order: RelativeImportsOrder, classes: &'a BTreeSet, constants: &'a BTreeSet, variables: &'a BTreeSet, @@ -568,7 +568,7 @@ pub fn format_imports( known_first_party: &BTreeSet, known_third_party: &BTreeSet, order_by_type: bool, - relative_imports_order: RelatveImportsOrder, + relative_imports_order: RelativeImportsOrder, single_line_exclusions: &BTreeSet, split_on_trailing_comma: bool, classes: &BTreeSet, @@ -681,7 +681,7 @@ mod tests { use test_case::test_case; use super::categorize::ImportType; - use super::settings::RelatveImportsOrder; + use super::settings::RelativeImportsOrder; use crate::assert_yaml_snapshot; use crate::linter::test_path; use crate::registry::Rule; @@ -1082,7 +1082,7 @@ mod tests { .as_path(), &Settings { isort: super::settings::Settings { - relative_imports_order: RelatveImportsOrder::ClosestToFurthest, + relative_imports_order: RelativeImportsOrder::ClosestToFurthest, ..super::settings::Settings::default() }, src: vec![Path::new("resources/test/fixtures/isort").to_path_buf()], diff --git a/src/rules/isort/settings.rs b/src/rules/isort/settings.rs index 303d6b6e3c..fdf4ba8d5f 100644 --- a/src/rules/isort/settings.rs +++ b/src/rules/isort/settings.rs @@ -10,7 +10,7 @@ use super::categorize::ImportType; #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema)] #[serde(deny_unknown_fields, rename_all = "kebab-case")] -pub enum RelatveImportsOrder { +pub enum RelativeImportsOrder { /// Place "closer" imports (fewer `.` characters, most local) before /// "further" imports (more `.` characters, least local). ClosestToFurthest, @@ -19,7 +19,7 @@ pub enum RelatveImportsOrder { FurthestToClosest, } -impl Default for RelatveImportsOrder { +impl Default for RelativeImportsOrder { fn default() -> Self { Self::FurthestToClosest } @@ -163,7 +163,7 @@ pub struct Options { /// `reverse-relative` default (`reverse-relative = false`); setting /// this to "closest-to-furthest" is equivalent to isort's `reverse-relative /// = true`. - pub relative_imports_order: Option, + pub relative_imports_order: Option, #[option( default = r#"[]"#, value_type = "Vec", @@ -227,7 +227,7 @@ pub struct Settings { pub known_first_party: BTreeSet, pub known_third_party: BTreeSet, pub order_by_type: bool, - pub relative_imports_order: RelatveImportsOrder, + pub relative_imports_order: RelativeImportsOrder, pub single_line_exclusions: BTreeSet, pub split_on_trailing_comma: bool, pub classes: BTreeSet, @@ -248,7 +248,7 @@ impl Default for Settings { known_first_party: BTreeSet::new(), known_third_party: BTreeSet::new(), order_by_type: true, - relative_imports_order: RelatveImportsOrder::default(), + relative_imports_order: RelativeImportsOrder::default(), single_line_exclusions: BTreeSet::new(), split_on_trailing_comma: true, classes: BTreeSet::new(), diff --git a/src/rules/isort/sorting.rs b/src/rules/isort/sorting.rs index 0095df6527..17cd99b6c1 100644 --- a/src/rules/isort/sorting.rs +++ b/src/rules/isort/sorting.rs @@ -2,7 +2,7 @@ use std::cmp::Ordering; use std::collections::BTreeSet; -use super::settings::RelatveImportsOrder; +use super::settings::RelativeImportsOrder; use super::types::EitherImport::{Import, ImportFrom}; use super::types::{AliasData, EitherImport, ImportFromData}; use crate::python::string; @@ -75,15 +75,15 @@ pub fn cmp_members( pub fn cmp_levels( level1: Option<&usize>, level2: Option<&usize>, - relative_imports_order: RelatveImportsOrder, + relative_imports_order: RelativeImportsOrder, ) -> Ordering { match (level1, level2) { (None, None) => Ordering::Equal, (None, Some(_)) => Ordering::Less, (Some(_), None) => Ordering::Greater, (Some(level1), Some(level2)) => match relative_imports_order { - RelatveImportsOrder::ClosestToFurthest => level1.cmp(level2), - RelatveImportsOrder::FurthestToClosest => level2.cmp(level1), + RelativeImportsOrder::ClosestToFurthest => level1.cmp(level2), + RelativeImportsOrder::FurthestToClosest => level2.cmp(level1), }, } } @@ -92,7 +92,7 @@ pub fn cmp_levels( pub fn cmp_import_from( import_from1: &ImportFromData, import_from2: &ImportFromData, - relative_imports_order: RelatveImportsOrder, + relative_imports_order: RelativeImportsOrder, ) -> Ordering { cmp_levels( import_from1.level, @@ -113,7 +113,7 @@ pub fn cmp_import_from( pub fn cmp_either_import( a: &EitherImport, b: &EitherImport, - relative_imports_order: RelatveImportsOrder, + relative_imports_order: RelativeImportsOrder, ) -> Ordering { match (a, b) { (Import((alias1, _)), Import((alias2, _))) => cmp_modules(alias1, alias2),