diff --git a/registry_gen.rs b/registry_gen.rs index 8e4baffbd5..1f10a40814 100644 --- a/registry_gen.rs +++ b/registry_gen.rs @@ -900,11 +900,6 @@ impl CheckCodePrefix { CheckCode::DTZ007, CheckCode::DTZ011, CheckCode::DTZ012, - CheckCode::RUF001, - CheckCode::RUF002, - CheckCode::RUF003, - CheckCode::RUF004, - CheckCode::RUF100, CheckCode::PGH001, CheckCode::PGH002, CheckCode::PGH003, @@ -949,6 +944,11 @@ impl CheckCodePrefix { CheckCode::PT024, CheckCode::PT025, CheckCode::PT026, + CheckCode::RUF001, + CheckCode::RUF002, + CheckCode::RUF003, + CheckCode::RUF004, + CheckCode::RUF100, ], CheckCodePrefix::ANN => vec![ CheckCode::ANN001, diff --git a/src/registry.rs b/src/registry.rs index 46bd936de6..90a46de957 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -341,12 +341,6 @@ pub enum CheckCode { DTZ007, DTZ011, DTZ012, - // Ruff - RUF001, - RUF002, - RUF003, - RUF004, - RUF100, // pygrep-hooks PGH001, PGH002, @@ -395,6 +389,12 @@ pub enum CheckCode { PT024, PT025, PT026, + // Ruff + RUF001, + RUF002, + RUF003, + RUF004, + RUF100, } #[derive(EnumIter, Debug, PartialEq, Eq)] @@ -1069,12 +1069,6 @@ pub enum CheckKind { RawStringInException, FStringInException, DotFormatInException, - // Ruff - AmbiguousUnicodeCharacterString(char, char), - AmbiguousUnicodeCharacterDocstring(char, char), - AmbiguousUnicodeCharacterComment(char, char), - KeywordArgumentBeforeStarArgument(String), - UnusedNOQA(Option), // flake8-datetimez CallDatetimeWithoutTzinfo, CallDatetimeToday, @@ -1111,6 +1105,12 @@ pub enum CheckKind { UnnecessaryAsyncioMarkOnFixture, ErroneousUseFixturesOnFixture, UseFixturesWithoutParameters, + // Ruff + AmbiguousUnicodeCharacterString(char, char), + AmbiguousUnicodeCharacterDocstring(char, char), + AmbiguousUnicodeCharacterComment(char, char), + KeywordArgumentBeforeStarArgument(String), + UnusedNOQA(Option), } impl CheckCode { @@ -3173,69 +3173,6 @@ impl CheckKind { CheckKind::DotFormatInException => "Exception must not use a `.format()` string \ directly, assign to variable first" .to_string(), - // Ruff - CheckKind::AmbiguousUnicodeCharacterString(confusable, representant) => { - format!( - "String contains ambiguous unicode character '{confusable}' (did you mean \ - '{representant}'?)" - ) - } - CheckKind::AmbiguousUnicodeCharacterDocstring(confusable, representant) => { - format!( - "Docstring contains ambiguous unicode character '{confusable}' (did you mean \ - '{representant}'?)" - ) - } - CheckKind::AmbiguousUnicodeCharacterComment(confusable, representant) => { - format!( - "Comment contains ambiguous unicode character '{confusable}' (did you mean \ - '{representant}'?)" - ) - } - CheckKind::KeywordArgumentBeforeStarArgument(name) => { - format!("Keyword argument `{name}` must come after starred arguments") - } - CheckKind::UnusedNOQA(codes) => match codes { - None => "Unused blanket `noqa` directive".to_string(), - Some(codes) => { - let mut codes_by_reason = vec![]; - if !codes.unmatched.is_empty() { - codes_by_reason.push(format!( - "unused: {}", - codes - .unmatched - .iter() - .map(|code| format!("`{code}`")) - .join(", ") - )); - } - if !codes.disabled.is_empty() { - codes_by_reason.push(format!( - "non-enabled: {}", - codes - .disabled - .iter() - .map(|code| format!("`{code}`")) - .join(", ") - )); - } - if !codes.unknown.is_empty() { - codes_by_reason.push(format!( - "unknown: {}", - codes - .unknown - .iter() - .map(|code| format!("`{code}`")) - .join(", ") - )); - } - if codes_by_reason.is_empty() { - "Unused `noqa` directive".to_string() - } else { - format!("Unused `noqa` directive ({})", codes_by_reason.join("; ")) - } - } - }, // flake8-datetimez CheckKind::CallDatetimeWithoutTzinfo => "The use of `datetime.datetime()` without \ `tzinfo` argument is not allowed" @@ -3365,6 +3302,69 @@ impl CheckKind { CheckKind::UseFixturesWithoutParameters => { "Useless `pytest.mark.usefixtures` without parameters".to_string() } + // Ruff + CheckKind::AmbiguousUnicodeCharacterString(confusable, representant) => { + format!( + "String contains ambiguous unicode character '{confusable}' (did you mean \ + '{representant}'?)" + ) + } + CheckKind::AmbiguousUnicodeCharacterDocstring(confusable, representant) => { + format!( + "Docstring contains ambiguous unicode character '{confusable}' (did you mean \ + '{representant}'?)" + ) + } + CheckKind::AmbiguousUnicodeCharacterComment(confusable, representant) => { + format!( + "Comment contains ambiguous unicode character '{confusable}' (did you mean \ + '{representant}'?)" + ) + } + CheckKind::KeywordArgumentBeforeStarArgument(name) => { + format!("Keyword argument `{name}` must come after starred arguments") + } + CheckKind::UnusedNOQA(codes) => match codes { + None => "Unused blanket `noqa` directive".to_string(), + Some(codes) => { + let mut codes_by_reason = vec![]; + if !codes.unmatched.is_empty() { + codes_by_reason.push(format!( + "unused: {}", + codes + .unmatched + .iter() + .map(|code| format!("`{code}`")) + .join(", ") + )); + } + if !codes.disabled.is_empty() { + codes_by_reason.push(format!( + "non-enabled: {}", + codes + .disabled + .iter() + .map(|code| format!("`{code}`")) + .join(", ") + )); + } + if !codes.unknown.is_empty() { + codes_by_reason.push(format!( + "unknown: {}", + codes + .unknown + .iter() + .map(|code| format!("`{code}`")) + .join(", ") + )); + } + if codes_by_reason.is_empty() { + "Unused `noqa` directive".to_string() + } else { + format!("Unused `noqa` directive ({})", codes_by_reason.join("; ")) + } + } + }, } }