Fix typo: RelatveImportsOrder (#2264)

This commit is contained in:
Aarni Koskela
2023-01-27 18:15:43 +02:00
committed by GitHub
parent a316b26b49
commit 779b232db9
4 changed files with 18 additions and 18 deletions

View File

@@ -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<String>,
constants: &'a BTreeSet<String>,
variables: &'a BTreeSet<String>,
@@ -568,7 +568,7 @@ pub fn format_imports(
known_first_party: &BTreeSet<String>,
known_third_party: &BTreeSet<String>,
order_by_type: bool,
relative_imports_order: RelatveImportsOrder,
relative_imports_order: RelativeImportsOrder,
single_line_exclusions: &BTreeSet<String>,
split_on_trailing_comma: bool,
classes: &BTreeSet<String>,
@@ -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()],

View File

@@ -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<RelatveImportsOrder>,
pub relative_imports_order: Option<RelativeImportsOrder>,
#[option(
default = r#"[]"#,
value_type = "Vec<String>",
@@ -227,7 +227,7 @@ pub struct Settings {
pub known_first_party: BTreeSet<String>,
pub known_third_party: BTreeSet<String>,
pub order_by_type: bool,
pub relative_imports_order: RelatveImportsOrder,
pub relative_imports_order: RelativeImportsOrder,
pub single_line_exclusions: BTreeSet<String>,
pub split_on_trailing_comma: bool,
pub classes: BTreeSet<String>,
@@ -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(),

View File

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