From bfb34b4f9443bb646cf09c4bb37d375eb5b20501 Mon Sep 17 00:00:00 2001 From: konstin Date: Mon, 2 Oct 2023 14:46:22 +0200 Subject: [PATCH 1/2] Rename `FixKind` to `FixAvailability` --- crates/ruff_cli/src/commands/rule.rs | 11 +++++++---- crates/ruff_dev/src/generate_docs.rs | 11 +++++++---- crates/ruff_dev/src/generate_rules_table.rs | 6 +++--- crates/ruff_diagnostics/src/lib.rs | 2 +- crates/ruff_diagnostics/src/violation.rs | 16 ++++++++-------- .../rules/mutable_argument_default.rs | 4 ++-- .../rules/unreliable_callable_check.rs | 4 ++-- .../rules/unused_loop_control_variable.rs | 4 ++-- .../rules/unnecessary_comprehension_any_all.rs | 4 ++-- .../rules/unnecessary_map.rs | 4 ++-- .../flake8_errmsg/rules/string_in_exception.rs | 8 ++++---- .../flake8_implicit_str_concat/rules/implicit.rs | 4 ++-- .../rules/unconventional_import_alias.rs | 4 ++-- .../rules/direct_logger_instantiation.rs | 4 ++-- .../rules/invalid_get_logger_argument.rs | 4 ++-- .../flake8_logging/rules/undocumented_warn.rs | 4 ++-- .../rules/reimplemented_list_builtin.rs | 4 ++-- .../flake8_pyi/rules/duplicate_union_member.rs | 4 ++-- .../rules/ellipsis_in_non_empty_class_body.rs | 4 ++-- .../rules/flake8_pyi/rules/exit_annotations.rs | 4 ++-- .../unaliased_collections_abc_set_import.rs | 4 ++-- .../rules/flake8_pytest_style/rules/assertion.rs | 8 ++++---- .../flake8_pytest_style/rules/parametrize.rs | 6 +++--- .../rules/flake8_simplify/rules/ast_bool_op.rs | 4 ++-- .../src/rules/flake8_simplify/rules/ast_expr.rs | 4 ++-- .../src/rules/flake8_simplify/rules/ast_if.rs | 10 +++++----- .../src/rules/flake8_simplify/rules/ast_ifexp.rs | 4 ++-- .../src/rules/flake8_simplify/rules/ast_with.rs | 4 ++-- .../rules/reimplemented_builtin.rs | 4 ++-- .../rules/suppressible_exception.rs | 4 ++-- .../flake8_simplify/rules/yoda_conditions.rs | 4 ++-- .../rules/relative_imports.rs | 4 ++-- .../runtime_import_in_type_checking_block.rs | 4 ++-- .../rules/typing_only_runtime_import.rs | 8 ++++---- .../src/rules/isort/rules/organize_imports.rs | 4 ++-- .../src/rules/numpy/rules/deprecated_function.rs | 4 ++-- .../rules/numpy/rules/deprecated_type_alias.rs | 4 ++-- .../rules/pandas_vet/rules/inplace_argument.rs | 4 ++-- .../rules/pycodestyle/rules/lambda_assignment.rs | 4 ++-- .../pydocstyle/rules/blank_after_summary.rs | 4 ++-- .../rules/no_surrounding_whitespace.rs | 4 ++-- .../src/rules/pydocstyle/rules/one_liner.rs | 4 ++-- .../pyflakes/rules/raise_not_implemented.rs | 4 ++-- .../src/rules/pyflakes/rules/repeated_keys.rs | 6 +++--- .../src/rules/pyflakes/rules/strings.rs | 6 +++--- .../src/rules/pyflakes/rules/unused_import.rs | 4 ++-- .../src/rules/pyflakes/rules/unused_variable.rs | 4 ++-- .../src/rules/pylint/rules/manual_import_from.rs | 4 ++-- .../src/rules/pylint/rules/nested_min_max.rs | 4 ++-- .../src/rules/pylint/rules/sys_exit_alias.rs | 4 ++-- .../convert_named_tuple_functional_to_class.rs | 4 ++-- .../convert_typed_dict_functional_to_class.rs | 4 ++-- .../rules/pyupgrade/rules/datetime_utc_alias.rs | 4 ++-- .../rules/pyupgrade/rules/deprecated_import.rs | 4 ++-- .../src/rules/pyupgrade/rules/f_strings.rs | 4 ++-- .../src/rules/pyupgrade/rules/format_literals.rs | 4 ++-- .../src/rules/pyupgrade/rules/open_alias.rs | 4 ++-- .../pyupgrade/rules/outdated_version_block.rs | 4 ++-- .../pyupgrade/rules/printf_string_formatting.rs | 4 ++-- .../pyupgrade/rules/replace_stdout_stderr.rs | 4 ++-- .../rules/pyupgrade/rules/type_of_primitive.rs | 4 ++-- .../pyupgrade/rules/typing_text_str_alias.rs | 4 ++-- .../pyupgrade/rules/use_pep585_annotation.rs | 4 ++-- .../pyupgrade/rules/use_pep604_annotation.rs | 4 ++-- .../pyupgrade/rules/use_pep695_type_alias.rs | 4 ++-- .../src/rules/refurb/rules/delete_full_slice.rs | 4 ++-- .../src/rules/refurb/rules/print_empty_string.rs | 4 ++-- .../rules/refurb/rules/reimplemented_starmap.rs | 4 ++-- .../src/rules/refurb/rules/repeated_append.rs | 4 ++-- .../src/rules/refurb/rules/slice_copy.rs | 4 ++-- .../rules/refurb/rules/unnecessary_enumerate.rs | 4 ++-- .../rules/collection_literal_concatenation.rs | 4 ++-- .../src/rules/ruff/rules/implicit_optional.rs | 4 ++-- .../rules/ruff/rules/invalid_pyproject_toml.rs | 4 ++-- crates/ruff_linter/src/test.rs | 14 +++++++------- crates/ruff_macros/src/map_codes.rs | 4 ++-- 76 files changed, 185 insertions(+), 179 deletions(-) diff --git a/crates/ruff_cli/src/commands/rule.rs b/crates/ruff_cli/src/commands/rule.rs index 1373ef3d46313..9763af53d5ce3 100644 --- a/crates/ruff_cli/src/commands/rule.rs +++ b/crates/ruff_cli/src/commands/rule.rs @@ -5,7 +5,7 @@ use serde::ser::SerializeSeq; use serde::{Serialize, Serializer}; use strum::IntoEnumIterator; -use ruff_diagnostics::FixKind; +use ruff_diagnostics::FixAvailability; use ruff_linter::registry::{Linter, Rule, RuleNamespace}; use crate::args::HelpFormat; @@ -51,9 +51,12 @@ fn format_rule_text(rule: Rule) -> String { output.push('\n'); output.push('\n'); - let fix_kind = rule.fixable(); - if matches!(fix_kind, FixKind::Always | FixKind::Sometimes) { - output.push_str(&fix_kind.to_string()); + let fix_availability = rule.fixable(); + if matches!( + fix_availability, + FixAvailability::Always | FixAvailability::Sometimes + ) { + output.push_str(&fix_availability.to_string()); output.push('\n'); output.push('\n'); } diff --git a/crates/ruff_dev/src/generate_docs.rs b/crates/ruff_dev/src/generate_docs.rs index 104e981a11b0c..4cddb678ffa8f 100644 --- a/crates/ruff_dev/src/generate_docs.rs +++ b/crates/ruff_dev/src/generate_docs.rs @@ -8,7 +8,7 @@ use anyhow::Result; use regex::{Captures, Regex}; use strum::IntoEnumIterator; -use ruff_diagnostics::FixKind; +use ruff_diagnostics::FixAvailability; use ruff_linter::registry::{Linter, Rule, RuleNamespace}; use ruff_workspace::options::Options; use ruff_workspace::options_base::OptionsMetadata; @@ -37,9 +37,12 @@ pub(crate) fn main(args: &Args) -> Result<()> { output.push('\n'); } - let fix_kind = rule.fixable(); - if matches!(fix_kind, FixKind::Always | FixKind::Sometimes) { - output.push_str(&fix_kind.to_string()); + let fix_availability = rule.fixable(); + if matches!( + fix_availability, + FixAvailability::Always | FixAvailability::Sometimes + ) { + output.push_str(&fix_availability.to_string()); output.push('\n'); output.push('\n'); } diff --git a/crates/ruff_dev/src/generate_rules_table.rs b/crates/ruff_dev/src/generate_rules_table.rs index 23f02d20a8031..6fb7d141cbab2 100644 --- a/crates/ruff_dev/src/generate_rules_table.rs +++ b/crates/ruff_dev/src/generate_rules_table.rs @@ -5,7 +5,7 @@ use itertools::Itertools; use strum::IntoEnumIterator; -use ruff_diagnostics::FixKind; +use ruff_diagnostics::FixAvailability; use ruff_linter::registry::{Linter, Rule, RuleNamespace}; use ruff_linter::upstream_categories::UpstreamCategoryAndPrefix; use ruff_workspace::options::Options; @@ -21,10 +21,10 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator, table_out.push('\n'); for rule in rules { let fix_token = match rule.fixable() { - FixKind::Always | FixKind::Sometimes => { + FixAvailability::Always | FixAvailability::Sometimes => { format!("{FIX_SYMBOL}") } - FixKind::None => format!("{FIX_SYMBOL}"), + FixAvailability::None => format!("{FIX_SYMBOL}"), }; let preview_token = if rule.is_preview() || rule.is_nursery() { format!("{PREVIEW_SYMBOL}") diff --git a/crates/ruff_diagnostics/src/lib.rs b/crates/ruff_diagnostics/src/lib.rs index 9315e23bc92ca..f21419abe9cd4 100644 --- a/crates/ruff_diagnostics/src/lib.rs +++ b/crates/ruff_diagnostics/src/lib.rs @@ -2,7 +2,7 @@ pub use diagnostic::{Diagnostic, DiagnosticKind}; pub use edit::Edit; pub use fix::{Applicability, Fix, IsolationLevel}; pub use source_map::{SourceMap, SourceMarker}; -pub use violation::{AlwaysFixableViolation, FixKind, Violation}; +pub use violation::{AlwaysFixableViolation, FixAvailability, Violation}; mod diagnostic; mod edit; diff --git a/crates/ruff_diagnostics/src/violation.rs b/crates/ruff_diagnostics/src/violation.rs index 9c171b8b1d319..b61ccfb85a436 100644 --- a/crates/ruff_diagnostics/src/violation.rs +++ b/crates/ruff_diagnostics/src/violation.rs @@ -1,26 +1,26 @@ use std::fmt::{Debug, Display}; #[derive(Debug, Copy, Clone)] -pub enum FixKind { +pub enum FixAvailability { Sometimes, Always, None, } -impl Display for FixKind { +impl Display for FixAvailability { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - FixKind::Sometimes => write!(f, "Fix is sometimes available."), - FixKind::Always => write!(f, "Fix is always available."), - FixKind::None => write!(f, "Fix is not available."), + FixAvailability::Sometimes => write!(f, "Fix is sometimes available."), + FixAvailability::Always => write!(f, "Fix is always available."), + FixAvailability::None => write!(f, "Fix is not available."), } } } pub trait Violation: Debug + PartialEq + Eq { /// `None` in the case an fix is never available or otherwise Some - /// [`FixKind`] describing the available fix. - const FIX_KIND: FixKind = FixKind::None; + /// [`FixAvailability`] describing the available fix. + const FIX_AVAILABILITY: FixAvailability = FixAvailability::None; /// The message used to describe the violation. fn message(&self) -> String; @@ -65,7 +65,7 @@ pub trait AlwaysFixableViolation: Debug + PartialEq + Eq { /// A blanket implementation. impl Violation for V { - const FIX_KIND: FixKind = FixKind::Always; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always; fn message(&self) -> String { ::message(self) diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs index a74f8218a7ea1..a680ad5d9a2be 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs @@ -1,5 +1,5 @@ use ast::call_path::{from_qualified_name, CallPath}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::is_docstring_stmt; use ruff_python_ast::{self as ast, Expr, Parameter, ParameterWithDefault}; @@ -64,7 +64,7 @@ use crate::registry::AsRule; pub struct MutableArgumentDefault; impl Violation for MutableArgumentDefault { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs index 37941c9e7cf4e..ea47a921e1a89 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs @@ -1,6 +1,6 @@ use ruff_python_ast::{self as ast, Constant, Expr}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -37,7 +37,7 @@ use crate::registry::AsRule; pub struct UnreliableCallableCheck; impl Violation for UnreliableCallableCheck { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs index 0bfca2726113b..aee8537a6af4c 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs @@ -1,6 +1,6 @@ use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::visitor::Visitor; use ruff_python_ast::{self as ast, Expr}; @@ -56,7 +56,7 @@ pub struct UnusedLoopControlVariable { } impl Violation for UnusedLoopControlVariable { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs index 8655186b4f97a..aac83459673e1 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Expr, Keyword}; use ruff_diagnostics::Violation; -use ruff_diagnostics::{Diagnostic, FixKind}; +use ruff_diagnostics::{Diagnostic, FixAvailability}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::any_over_expr; use ruff_text_size::Ranged; @@ -44,7 +44,7 @@ use crate::rules::flake8_comprehensions::fixes; pub struct UnnecessaryComprehensionAnyAll; impl Violation for UnnecessaryComprehensionAnyAll { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs index 463588b81034c..cb2be309bb86a 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs @@ -1,7 +1,7 @@ use std::fmt; use ruff_diagnostics::{Diagnostic, Fix}; -use ruff_diagnostics::{FixKind, Violation}; +use ruff_diagnostics::{FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::visitor; use ruff_python_ast::visitor::Visitor; @@ -47,7 +47,7 @@ pub struct UnnecessaryMap { } impl Violation for UnnecessaryMap { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs b/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs index 02b4e004554ad..ea73c92752263 100644 --- a/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs +++ b/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Arguments, Constant, Expr, ExprContext, Stmt}; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::whitespace; use ruff_python_codegen::{Generator, Stylist}; @@ -50,7 +50,7 @@ use crate::registry::{AsRule, Rule}; pub struct RawStringInException; impl Violation for RawStringInException { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -104,7 +104,7 @@ impl Violation for RawStringInException { pub struct FStringInException; impl Violation for FStringInException { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -160,7 +160,7 @@ impl Violation for FStringInException { pub struct DotFormatInException; impl Violation for DotFormatInException { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs index 99df87a28b4ce..b0a06b9ad99ca 100644 --- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs +++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs @@ -3,7 +3,7 @@ use ruff_python_parser::lexer::LexResult; use ruff_python_parser::Tok; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_index::Indexer; @@ -36,7 +36,7 @@ use crate::rules::flake8_implicit_str_concat::settings::Settings; pub struct SingleLineImplicitStringConcatenation; impl Violation for SingleLineImplicitStringConcatenation { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs index 6de3466e871bf..3fd576876c8d2 100644 --- a/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs +++ b/crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs @@ -1,6 +1,6 @@ use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_semantic::{Binding, Imported}; use ruff_text_size::Ranged; @@ -37,7 +37,7 @@ pub struct UnconventionalImportAlias { } impl Violation for UnconventionalImportAlias { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs index 7833ffb620ff7..7d8d9af04bf19 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs +++ b/crates/ruff_linter/src/rules/flake8_logging/rules/direct_logger_instantiation.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast as ast; use ruff_text_size::Ranged; @@ -41,7 +41,7 @@ use crate::registry::AsRule; pub struct DirectLoggerInstantiation; impl Violation for DirectLoggerInstantiation { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs index a2c0a214dd675..956f23b3aeb7a 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs +++ b/crates/ruff_linter/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Expr}; use ruff_text_size::Ranged; @@ -44,7 +44,7 @@ use crate::registry::AsRule; pub struct InvalidGetLoggerArgument; impl Violation for InvalidGetLoggerArgument { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs b/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs index 2a28142aea0d7..6e64dab7fe12f 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs +++ b/crates/ruff_linter/src/rules/flake8_logging/rules/undocumented_warn.rs @@ -1,6 +1,6 @@ use ruff_python_ast::Expr; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -36,7 +36,7 @@ use crate::registry::AsRule; pub struct UndocumentedWarn; impl Violation for UndocumentedWarn { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { format!("Use of undocumented `logging.WARN` constant") diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_list_builtin.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_list_builtin.rs index 9866b91db6f99..05492d9babe80 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_list_builtin.rs +++ b/crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_list_builtin.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Expr, ExprLambda}; use ruff_diagnostics::{Diagnostic, Edit, Fix}; -use ruff_diagnostics::{FixKind, Violation}; +use ruff_diagnostics::{FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -40,7 +40,7 @@ use crate::registry::AsRule; pub struct ReimplementedListBuiltin; impl Violation for ReimplementedListBuiltin { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs index c87f96dde063d..fea8b83aeb230 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs @@ -5,7 +5,7 @@ use std::collections::HashSet; use crate::checkers::ast::Checker; use crate::registry::AsRule; use crate::rules::flake8_pyi::helpers::traverse_union; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::comparable::ComparableExpr; use ruff_text_size::Ranged; @@ -34,7 +34,7 @@ pub struct DuplicateUnionMember { } impl Violation for DuplicateUnionMember { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs index 9a6e2d38667d8..db80761f03c06 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{Constant, Expr, ExprConstant, Stmt, StmtExpr}; use ruff_text_size::Ranged; @@ -31,7 +31,7 @@ use crate::registry::AsRule; pub struct EllipsisInNonEmptyClassBody; impl Violation for EllipsisInNonEmptyClassBody { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs index 6c182e3db7041..24321f62ee2eb 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs @@ -6,7 +6,7 @@ use ruff_python_ast::{ }; use smallvec::SmallVec; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::is_const_none; use ruff_python_semantic::SemanticModel; @@ -49,7 +49,7 @@ pub struct BadExitAnnotation { } impl Violation for BadExitAnnotation { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs index fd36a49254ede..29794d5f719b0 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_semantic::Imported; use ruff_python_semantic::{Binding, BindingKind}; @@ -33,7 +33,7 @@ use crate::renamer::Renamer; pub struct UnaliasedCollectionsAbcSetImport; impl Violation for UnaliasedCollectionsAbcSetImport { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs index 3d51ed37bcfe3..d0286bb55f5bc 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs @@ -7,7 +7,7 @@ use libcst_native::{ SimpleWhitespace, SmallStatement, Statement, TrailingWhitespace, }; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::Truthiness; use ruff_python_ast::parenthesize::parenthesized_range; @@ -62,7 +62,7 @@ use super::unittest_assert::UnittestAssert; pub struct PytestCompositeAssertion; impl Violation for PytestCompositeAssertion { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -192,7 +192,7 @@ pub struct PytestUnittestAssertion { } impl Violation for PytestUnittestAssertion { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -354,7 +354,7 @@ pub struct PytestUnittestRaisesAssertion { } impl Violation for PytestUnittestRaisesAssertion { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs index dff1572afc187..1df32c72fbf00 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs @@ -2,7 +2,7 @@ use std::hash::BuildHasherDefault; use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::node::AstNode; @@ -77,7 +77,7 @@ pub struct PytestParametrizeNamesWrongType { } impl Violation for PytestParametrizeNamesWrongType { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -234,7 +234,7 @@ pub struct PytestDuplicateParametrizeTestCases { } impl Violation for PytestDuplicateParametrizeTestCases { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs index 4d59f96b72281..eb41bcad7f2bb 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs @@ -7,7 +7,7 @@ use ruff_python_ast::{self as ast, Arguments, BoolOp, CmpOp, Expr, ExprContext, use ruff_text_size::{Ranged, TextRange}; use rustc_hash::FxHashMap; -use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::helpers::{contains_effect, Truthiness}; @@ -49,7 +49,7 @@ pub struct DuplicateIsinstanceCall { } impl Violation for DuplicateIsinstanceCall { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs index 26e8f4e3c5f17..e6feaa6b27e92 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs @@ -2,7 +2,7 @@ use ruff_python_ast::{self as ast, Arguments, Constant, Expr}; use ruff_text_size::{Ranged, TextRange}; use crate::fix::snippet::SourceCodeSnippet; -use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::is_const_none; @@ -41,7 +41,7 @@ pub struct UncapitalizedEnvironmentVariables { } impl Violation for UncapitalizedEnvironmentVariables { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_if.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_if.rs index 6da1416592d9a..ec76d2c4e3bc3 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_if.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_if.rs @@ -5,7 +5,7 @@ use ruff_python_ast::{ use ruff_text_size::{Ranged, TextRange}; use rustc_hash::FxHashSet; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::comparable::{ComparableConstant, ComparableExpr, ComparableStmt}; use ruff_python_ast::helpers::{any_over_expr, contains_effect}; @@ -56,7 +56,7 @@ fn compare_stmt(stmt1: &ComparableStmt, stmt2: &ComparableStmt) -> bool { pub struct CollapsibleIf; impl Violation for CollapsibleIf { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -96,7 +96,7 @@ pub struct NeedlessBool { } impl Violation for NeedlessBool { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -168,7 +168,7 @@ pub struct IfElseBlockInsteadOfIfExp { } impl Violation for IfElseBlockInsteadOfIfExp { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -242,7 +242,7 @@ pub struct IfElseBlockInsteadOfDictGet { } impl Violation for IfElseBlockInsteadOfDictGet { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs index 1b1974d58ec2d..a989660b2cb62 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Arguments, Expr, ExprContext, UnaryOp}; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::{is_const_false, is_const_true}; use ruff_python_ast::parenthesize::parenthesized_range; @@ -35,7 +35,7 @@ pub struct IfExprWithTrueFalse { } impl Violation for IfExprWithTrueFalse { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs index 3b1241d5e4585..cf16c9245f404 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_with.rs @@ -1,7 +1,7 @@ use log::error; use ruff_diagnostics::{Diagnostic, Fix}; -use ruff_diagnostics::{FixKind, Violation}; +use ruff_diagnostics::{FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Stmt, WithItem}; use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer}; @@ -45,7 +45,7 @@ use super::fix_with; pub struct MultipleWithStatements; impl Violation for MultipleWithStatements { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs index d8ffb3765e517..cd1bc13905ba5 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs @@ -3,7 +3,7 @@ use ruff_python_ast::{ }; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::any_over_expr; use ruff_python_ast::traversal; @@ -43,7 +43,7 @@ pub struct ReimplementedBuiltin { } impl Violation for ReimplementedBuiltin { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs index a874020c42a31..91f8928cff2d8 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/suppressible_exception.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::call_path::compose_call_path; use ruff_python_ast::helpers; @@ -48,7 +48,7 @@ pub struct SuppressibleException { } impl Violation for SuppressibleException { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs index a3a65d8d3b80a..65feceb3b78d2 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs @@ -1,7 +1,7 @@ use anyhow::Result; use libcst_native::CompOp; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, CmpOp, Expr, UnaryOp}; use ruff_python_codegen::Stylist; @@ -52,7 +52,7 @@ pub struct YodaConditions { } impl Violation for YodaConditions { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs index 91c11ef11d128..be176a9b6d06d 100644 --- a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs +++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Identifier, Stmt}; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::resolve_imported_module_path; use ruff_python_codegen::Generator; @@ -51,7 +51,7 @@ pub struct RelativeImports { } impl Violation for RelativeImports { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs index ce4e5b9f78487..eb0e29c1b2b3a 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs +++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs @@ -3,7 +3,7 @@ use std::borrow::Cow; use anyhow::Result; use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_semantic::{AnyImport, Imported, NodeId, ResolvedReferenceId, Scope}; use ruff_text_size::{Ranged, TextRange}; @@ -49,7 +49,7 @@ pub struct RuntimeImportInTypeCheckingBlock { } impl Violation for RuntimeImportInTypeCheckingBlock { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs b/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs index 7952c0d309180..c041565428484 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs +++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs @@ -3,7 +3,7 @@ use std::borrow::Cow; use anyhow::Result; use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_semantic::{AnyImport, Binding, Imported, NodeId, ResolvedReferenceId, Scope}; use ruff_text_size::{Ranged, TextRange}; @@ -67,7 +67,7 @@ pub struct TypingOnlyFirstPartyImport { } impl Violation for TypingOnlyFirstPartyImport { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -135,7 +135,7 @@ pub struct TypingOnlyThirdPartyImport { } impl Violation for TypingOnlyThirdPartyImport { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -203,7 +203,7 @@ pub struct TypingOnlyStandardLibraryImport { } impl Violation for TypingOnlyStandardLibraryImport { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs b/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs index 5385ac918dc6c..cdbd9e493cda9 100644 --- a/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs +++ b/crates/ruff_linter/src/rules/isort/rules/organize_imports.rs @@ -2,7 +2,7 @@ use std::path::Path; use itertools::{EitherOrBoth, Itertools}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::whitespace::trailing_lines_end; use ruff_python_ast::{PySourceType, Stmt}; @@ -41,7 +41,7 @@ use super::super::{comments, format_imports}; pub struct UnsortedImports; impl Violation for UnsortedImports { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs b/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs index 50a1e19859983..5edf807b3983a 100644 --- a/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs +++ b/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::Expr; use ruff_text_size::Ranged; @@ -37,7 +37,7 @@ pub struct NumpyDeprecatedFunction { } impl Violation for NumpyDeprecatedFunction { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs b/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs index 5d40292c5935e..aef527328e595 100644 --- a/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs +++ b/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::Expr; use ruff_text_size::Ranged; @@ -34,7 +34,7 @@ pub struct NumpyDeprecatedTypeAlias { } impl Violation for NumpyDeprecatedTypeAlias { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs b/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs index c6159d0a3cffb..528421a8f4251 100644 --- a/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs +++ b/crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::is_const_true; use ruff_python_ast::parenthesize::parenthesized_range; @@ -39,7 +39,7 @@ use crate::registry::AsRule; pub struct PandasUseOfInplaceArgument; impl Violation for PandasUseOfInplaceArgument { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs index 1c9fad267add3..fa98ca61b428d 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs +++ b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs @@ -3,7 +3,7 @@ use ruff_python_ast::{ }; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_codegen::Generator; use ruff_python_semantic::SemanticModel; @@ -42,7 +42,7 @@ pub struct LambdaAssignment { } impl Violation for LambdaAssignment { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs index e01b82bbcefca..40a340b8d82b0 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs +++ b/crates/ruff_linter/src/rules/pydocstyle/rules/blank_after_summary.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_source_file::{UniversalNewlineIterator, UniversalNewlines}; use ruff_text_size::Ranged; @@ -47,7 +47,7 @@ pub struct BlankLineAfterSummary { } impl Violation for BlankLineAfterSummary { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs index 1ac7ed09cf074..f5122fac05b38 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs +++ b/crates/ruff_linter/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_source_file::NewlineWithTrailingNewline; use ruff_text_size::Ranged; @@ -35,7 +35,7 @@ use crate::rules::pydocstyle::helpers::ends_with_backslash; pub struct SurroundingWhitespace; impl Violation for SurroundingWhitespace { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs b/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs index e11ce65c039c5..76f139cbc4c68 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs +++ b/crates/ruff_linter/src/rules/pydocstyle/rules/one_liner.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_source_file::NewlineWithTrailingNewline; @@ -37,7 +37,7 @@ use crate::registry::AsRule; pub struct FitsOnOneLine; impl Violation for FitsOnOneLine { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs b/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs index 6998e19d4249c..e21e33ed5c0a2 100644 --- a/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs +++ b/crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs @@ -1,6 +1,6 @@ use ruff_python_ast::{self as ast, Expr}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -39,7 +39,7 @@ use crate::registry::AsRule; pub struct RaiseNotImplemented; impl Violation for RaiseNotImplemented { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs b/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs index e4f53392568f3..0aebe6ac388f4 100644 --- a/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs +++ b/crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs @@ -2,7 +2,7 @@ use std::hash::BuildHasherDefault; use rustc_hash::{FxHashMap, FxHashSet}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::parenthesize::parenthesized_range; @@ -49,7 +49,7 @@ pub struct MultiValueRepeatedKeyLiteral { } impl Violation for MultiValueRepeatedKeyLiteral { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -106,7 +106,7 @@ pub struct MultiValueRepeatedKeyVariable { } impl Violation for MultiValueRepeatedKeyVariable { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs b/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs index 28f30928280fc..237a6a74426b2 100644 --- a/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs +++ b/crates/ruff_linter/src/rules/pyflakes/rules/strings.rs @@ -2,7 +2,7 @@ use std::string::ToString; use rustc_hash::FxHashSet; -use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Fix, FixKind, Violation}; +use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Constant, Expr, Identifier, Keyword}; use ruff_text_size::{Ranged, TextRange}; @@ -387,7 +387,7 @@ pub struct StringDotFormatExtraNamedArguments { } impl Violation for StringDotFormatExtraNamedArguments { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { @@ -428,7 +428,7 @@ pub struct StringDotFormatExtraPositionalArguments { } impl Violation for StringDotFormatExtraPositionalArguments { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs b/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs index ed4c671a4ec29..3595dfeba42ee 100644 --- a/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs +++ b/crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs @@ -3,7 +3,7 @@ use std::borrow::Cow; use anyhow::Result; use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_semantic::{AnyImport, Exceptions, Imported, NodeId, Scope}; use ruff_text_size::{Ranged, TextRange}; @@ -67,7 +67,7 @@ pub struct UnusedImport { } impl Violation for UnusedImport { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs b/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs index 66f1d1449a1a4..f7ae6524f14a0 100644 --- a/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs +++ b/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs @@ -1,6 +1,6 @@ use itertools::Itertools; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::contains_effect; use ruff_python_ast::parenthesize::parenthesized_range; @@ -48,7 +48,7 @@ pub struct UnusedVariable { } impl Violation for UnusedVariable { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs index 05d035fee28d5..0761359f94449 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Alias, Identifier, Stmt}; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use crate::checkers::ast::Checker; @@ -33,7 +33,7 @@ pub struct ManualFromImport { } impl Violation for ManualFromImport { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs index 758fd845e62d6..0d0608b3a7eed 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Arguments, Expr, Keyword}; use ruff_text_size::{Ranged, TextRange}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_semantic::SemanticModel; @@ -43,7 +43,7 @@ pub struct NestedMinMax { } impl Violation for NestedMinMax { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] diff --git a/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs b/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs index 558717c255f3c..9c311d04d55c5 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs @@ -1,6 +1,6 @@ use ruff_python_ast::{self as ast, Expr}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -43,7 +43,7 @@ pub struct SysExitAlias { } impl Violation for SysExitAlias { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs index e090bd3275283..4fd5e665cde6c 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs @@ -1,6 +1,6 @@ use log::debug; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::is_dunder; use ruff_python_ast::{ @@ -50,7 +50,7 @@ pub struct ConvertNamedTupleFunctionalToClass { } impl Violation for ConvertNamedTupleFunctionalToClass { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs index 688ef4c46a527..9b028ae38994f 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::is_dunder; use ruff_python_ast::{ @@ -47,7 +47,7 @@ pub struct ConvertTypedDictFunctionalToClass { } impl Violation for ConvertTypedDictFunctionalToClass { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs index 715c780c94f79..ee37a7e1c79da 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/datetime_utc_alias.rs @@ -1,6 +1,6 @@ use ruff_python_ast::Expr; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -38,7 +38,7 @@ use crate::registry::AsRule; pub struct DatetimeTimezoneUTC; impl Violation for DatetimeTimezoneUTC { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs index f54b9e501b121..113e3ba5db45f 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs @@ -1,7 +1,7 @@ use itertools::Itertools; use ruff_python_ast::{Alias, Stmt}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::whitespace::indentation; use ruff_python_codegen::Stylist; @@ -66,7 +66,7 @@ pub struct DeprecatedImport { } impl Violation for DeprecatedImport { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs index 996bb31e35902..d0d329bec8f27 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/f_strings.rs @@ -3,7 +3,7 @@ use std::borrow::Cow; use anyhow::{Context, Result}; use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_ast::{self as ast, Constant, Expr, Keyword}; @@ -44,7 +44,7 @@ use crate::rules::pyupgrade::helpers::curly_escape; pub struct FString; impl Violation for FString { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs index 7d52f58b78033..44fed731079e8 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs @@ -3,7 +3,7 @@ use libcst_native::{Arg, Expression}; use once_cell::sync::Lazy; use regex::Regex; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Expr}; use ruff_python_codegen::Stylist; @@ -46,7 +46,7 @@ use crate::rules::pyflakes::format::FormatSummary; pub struct FormatLiterals; impl Violation for FormatLiterals { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs index b34b610a54535..35ea30241a8d1 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/open_alias.rs @@ -1,6 +1,6 @@ use ruff_python_ast::Expr; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -34,7 +34,7 @@ use crate::registry::AsRule; pub struct OpenAlias; impl Violation for OpenAlias { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs index 2e8cfc932cd43..6cd829b3b7357 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs @@ -1,7 +1,7 @@ use std::cmp::Ordering; use anyhow::Result; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::stmt_if::{if_elif_branches, BranchKind, IfElifBranch}; use ruff_python_ast::whitespace::indentation; @@ -51,7 +51,7 @@ pub struct OutdatedVersionBlock { } impl Violation for OutdatedVersionBlock { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs index 9989bc90877a9..76d2d108ffee3 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs @@ -1,6 +1,6 @@ use std::str::FromStr; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_ast::whitespace::indentation; @@ -68,7 +68,7 @@ use crate::rules::pyupgrade::helpers::curly_escape; pub struct PrintfStringFormatting; impl Violation for PrintfStringFormatting { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs index 2c862994ca7a8..481afd4c4b5b8 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs @@ -1,6 +1,6 @@ use anyhow::Result; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Keyword}; use ruff_text_size::Ranged; @@ -40,7 +40,7 @@ use crate::registry::AsRule; pub struct ReplaceStdoutStderr; impl Violation for ReplaceStdoutStderr { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs index 2ff6c4cc36d78..2e9abe998df67 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/type_of_primitive.rs @@ -1,7 +1,7 @@ use ruff_python_ast::{self as ast, Expr}; use crate::fix::edits::pad; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -37,7 +37,7 @@ pub struct TypeOfPrimitive { } impl Violation for TypeOfPrimitive { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs index 52d99a95a90c5..1b10074c1438f 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/typing_text_str_alias.rs @@ -1,6 +1,6 @@ use ruff_python_ast::Expr; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_text_size::Ranged; @@ -33,7 +33,7 @@ use crate::registry::AsRule; pub struct TypingTextStrAlias; impl Violation for TypingTextStrAlias { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs index 2c1f5a3298b3c..548d12f0bc423 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs @@ -1,6 +1,6 @@ use ruff_python_ast::Expr; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::call_path::compose_call_path; use ruff_python_semantic::analyze::typing::ModuleMember; @@ -56,7 +56,7 @@ pub struct NonPEP585Annotation { } impl Violation for NonPEP585Annotation { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs index c666e21c54359..04fb3bb7b50e4 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Constant, Expr, ExprContext, Operator}; use ruff_python_semantic::analyze::typing::Pep604Operator; @@ -45,7 +45,7 @@ use crate::registry::AsRule; pub struct NonPEP604Annotation; impl Violation for NonPEP604Annotation { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep695_type_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep695_type_alias.rs index 590d0491a39e6..07863a2616b7e 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep695_type_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep695_type_alias.rs @@ -1,5 +1,5 @@ use ast::{Constant, ExprCall, ExprConstant}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{ self as ast, @@ -49,7 +49,7 @@ pub struct NonPEP695TypeAlias { } impl Violation for NonPEP695TypeAlias { - const FIX_KIND: FixKind = FixKind::Always; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs b/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs index e5c17ddc00a10..9ca1b4d8e3db0 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/delete_full_slice.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Expr}; use ruff_python_semantic::analyze::typing::{is_dict, is_list}; @@ -47,7 +47,7 @@ use crate::rules::refurb::helpers::generate_method_call; pub struct DeleteFullSlice; impl Violation for DeleteFullSlice { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs b/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs index 36c5349b75495..08b6fade27cf0 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/print_empty_string.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Constant, Expr}; use ruff_python_codegen::Generator; @@ -43,7 +43,7 @@ enum Reason { } impl Violation for PrintEmptyString { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs index 79933c10ea603..a8ce08f46f839 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs @@ -1,5 +1,5 @@ use anyhow::{bail, Result}; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::{self as ast, Expr}; @@ -57,7 +57,7 @@ use crate::registry::AsRule; pub struct ReimplementedStarmap; impl Violation for ReimplementedStarmap { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs index 6f927a029404c..3dbc0760f3109 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs @@ -1,7 +1,7 @@ use rustc_hash::FxHashMap; use ast::traversal; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Expr, Stmt}; use ruff_python_codegen::Generator; @@ -60,7 +60,7 @@ impl RepeatedAppend { } impl Violation for RepeatedAppend { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs b/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs index 671bb3c3c1920..67c19aeae0b99 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/slice_copy.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Expr}; use ruff_python_semantic::analyze::typing::is_list; @@ -39,7 +39,7 @@ use crate::rules::refurb::helpers::generate_method_call; pub struct SliceCopy; impl Violation for SliceCopy { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs index 6c81f4796b59f..72559dbde84b0 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs @@ -1,6 +1,6 @@ use std::fmt; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast as ast; use ruff_python_ast::{Arguments, Constant, Expr, Int}; @@ -51,7 +51,7 @@ pub struct UnnecessaryEnumerate { } impl Violation for UnnecessaryEnumerate { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs index 686aa4c1bfcf1..bbc26889354c1 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::{self as ast, Expr, ExprContext, Operator}; use ruff_text_size::{Ranged, TextRange}; @@ -43,7 +43,7 @@ pub struct CollectionLiteralConcatenation { } impl Violation for CollectionLiteralConcatenation { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs b/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs index 0d097c89526b1..22dfc5bab325d 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs @@ -2,7 +2,7 @@ use std::fmt; use anyhow::Result; -use ruff_diagnostics::{Diagnostic, Edit, Fix, FixKind, Violation}; +use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::helpers::is_const_none; use ruff_python_ast::{self as ast, Constant, Expr, Operator, ParameterWithDefault, Parameters}; @@ -80,7 +80,7 @@ pub struct ImplicitOptional { } impl Violation for ImplicitOptional { - const FIX_KIND: FixKind = FixKind::Sometimes; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs b/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs index 45755d790e595..8d34ea57481d9 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/invalid_pyproject_toml.rs @@ -1,4 +1,4 @@ -use ruff_diagnostics::{FixKind, Violation}; +use ruff_diagnostics::{FixAvailability, Violation}; use ruff_macros::{derive_message_formats, violation}; /// ## What it does @@ -36,7 +36,7 @@ pub struct InvalidPyprojectToml { } impl Violation for InvalidPyprojectToml { - const FIX_KIND: FixKind = FixKind::None; + const FIX_AVAILABILITY: FixAvailability = FixAvailability::None; #[derive_message_formats] fn message(&self) -> String { diff --git a/crates/ruff_linter/src/test.rs b/crates/ruff_linter/src/test.rs index 8c27c2806d6ed..8fa6b0a6859a6 100644 --- a/crates/ruff_linter/src/test.rs +++ b/crates/ruff_linter/src/test.rs @@ -9,7 +9,7 @@ use anyhow::Result; use itertools::Itertools; use rustc_hash::FxHashMap; -use ruff_diagnostics::{Diagnostic, FixKind}; +use ruff_diagnostics::{Diagnostic, FixAvailability}; use ruff_python_ast::PySourceType; use ruff_python_codegen::Stylist; use ruff_python_index::Indexer; @@ -239,15 +239,15 @@ Source with applied fixes: let fixable = diagnostic.fix.is_some(); match (fixable, rule.fixable()) { - (true, FixKind::Sometimes | FixKind::Always) - | (false, FixKind::None | FixKind::Sometimes) => { + (true, FixAvailability::Sometimes | FixAvailability::Always) + | (false, FixAvailability::None | FixAvailability::Sometimes) => { // Ok } - (true, FixKind::None) => { - panic!("Rule {rule:?} is marked as non-fixable but it created a fix. Change the `Violation::FIX_KIND` to either `FixKind::Sometimes` or `FixKind::Always`"); + (true, FixAvailability::None) => { + panic!("Rule {rule:?} is marked as non-fixable but it created a fix. Change the `Violation::FIX_AVAILABILITY` to either `FixAvailability::Sometimes` or `FixAvailability::Always`"); }, - (false, FixKind::Always) => { - panic!("Rule {rule:?} is marked to always-fixable but the diagnostic has no fix. Either ensure you always emit a fix or change `Violation::FIX_KINDd` to either `FixKind::Sometimes` or `FixKind::None") + (false, FixAvailability::Always) => { + panic!("Rule {rule:?} is marked to always-fixable but the diagnostic has no fix. Either ensure you always emit a fix or change `Violation::FIX_AVAILIBITYd` to either `FixAvailability::Sometimes` or `FixAvailability::None") } } diff --git a/crates/ruff_macros/src/map_codes.rs b/crates/ruff_macros/src/map_codes.rs index f85377dae3785..b0df4f053f459 100644 --- a/crates/ruff_macros/src/map_codes.rs +++ b/crates/ruff_macros/src/map_codes.rs @@ -405,7 +405,7 @@ fn register_rules<'a>(input: impl Iterator) -> TokenStream { rule_message_formats_match_arms .extend(quote! {#(#attrs)* Self::#name => <#path as ruff_diagnostics::Violation>::message_formats(),}); rule_fixable_match_arms.extend( - quote! {#(#attrs)* Self::#name => <#path as ruff_diagnostics::Violation>::FIX_KIND,}, + quote! {#(#attrs)* Self::#name => <#path as ruff_diagnostics::Violation>::FIX_AVAILABILITY,}, ); rule_explanation_match_arms .extend(quote! {#(#attrs)* Self::#name => #path::explanation(),}); @@ -448,7 +448,7 @@ fn register_rules<'a>(input: impl Iterator) -> TokenStream { } /// Returns the fix status of this rule. - pub const fn fixable(&self) -> ruff_diagnostics::FixKind { + pub const fn fixable(&self) -> ruff_diagnostics::FixAvailability { match self { #rule_fixable_match_arms } } } From 1696252de2f7dfb0a3e1abb9e514e28a222acffc Mon Sep 17 00:00:00 2001 From: konstin Date: Mon, 2 Oct 2023 16:28:44 +0200 Subject: [PATCH 2/2] Typo --- crates/ruff_linter/src/test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ruff_linter/src/test.rs b/crates/ruff_linter/src/test.rs index 8fa6b0a6859a6..75de40cd2e0d7 100644 --- a/crates/ruff_linter/src/test.rs +++ b/crates/ruff_linter/src/test.rs @@ -247,7 +247,7 @@ Source with applied fixes: panic!("Rule {rule:?} is marked as non-fixable but it created a fix. Change the `Violation::FIX_AVAILABILITY` to either `FixAvailability::Sometimes` or `FixAvailability::Always`"); }, (false, FixAvailability::Always) => { - panic!("Rule {rule:?} is marked to always-fixable but the diagnostic has no fix. Either ensure you always emit a fix or change `Violation::FIX_AVAILIBITYd` to either `FixAvailability::Sometimes` or `FixAvailability::None") + panic!("Rule {rule:?} is marked to always-fixable but the diagnostic has no fix. Either ensure you always emit a fix or change `Violation::FIX_AVAILABILITY` to either `FixAvailability::Sometimes` or `FixAvailability::None") } }