Rename FixKind to FixAvailability (#7658)

**Summary** `FixKind` feels to generic, i suggest renaming it to
something like `FixAvailibility`.

Commands used:

```bash
rg FixKind --files-with-matches | xargs sed -i 's/FixKind/FixAvailability/g'
rg fix_kind --files-with-matches | xargs sed -i 's/fix_kind/fix_availability/g'
rg FIX_KIND --files-with-matches | xargs sed -i 's/FIX_KIND/FIX_AVAILABILITY/g'
cargo fmt
```

`rg -i "fix.kind"` doesn't show any matches anymore.
This commit is contained in:
konsti 2023-10-02 16:38:25 +02:00 committed by GitHub
parent ebdfcee87f
commit 0961f008b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 185 additions and 179 deletions

View file

@ -5,7 +5,7 @@ use serde::ser::SerializeSeq;
use serde::{Serialize, Serializer}; use serde::{Serialize, Serializer};
use strum::IntoEnumIterator; use strum::IntoEnumIterator;
use ruff_diagnostics::FixKind; use ruff_diagnostics::FixAvailability;
use ruff_linter::registry::{Linter, Rule, RuleNamespace}; use ruff_linter::registry::{Linter, Rule, RuleNamespace};
use crate::args::HelpFormat; use crate::args::HelpFormat;
@ -51,9 +51,12 @@ fn format_rule_text(rule: Rule) -> String {
output.push('\n'); output.push('\n');
output.push('\n'); output.push('\n');
let fix_kind = rule.fixable(); let fix_availability = rule.fixable();
if matches!(fix_kind, FixKind::Always | FixKind::Sometimes) { if matches!(
output.push_str(&fix_kind.to_string()); fix_availability,
FixAvailability::Always | FixAvailability::Sometimes
) {
output.push_str(&fix_availability.to_string());
output.push('\n'); output.push('\n');
output.push('\n'); output.push('\n');
} }

View file

@ -8,7 +8,7 @@ use anyhow::Result;
use regex::{Captures, Regex}; use regex::{Captures, Regex};
use strum::IntoEnumIterator; use strum::IntoEnumIterator;
use ruff_diagnostics::FixKind; use ruff_diagnostics::FixAvailability;
use ruff_linter::registry::{Linter, Rule, RuleNamespace}; use ruff_linter::registry::{Linter, Rule, RuleNamespace};
use ruff_workspace::options::Options; use ruff_workspace::options::Options;
use ruff_workspace::options_base::OptionsMetadata; use ruff_workspace::options_base::OptionsMetadata;
@ -37,9 +37,12 @@ pub(crate) fn main(args: &Args) -> Result<()> {
output.push('\n'); output.push('\n');
} }
let fix_kind = rule.fixable(); let fix_availability = rule.fixable();
if matches!(fix_kind, FixKind::Always | FixKind::Sometimes) { if matches!(
output.push_str(&fix_kind.to_string()); fix_availability,
FixAvailability::Always | FixAvailability::Sometimes
) {
output.push_str(&fix_availability.to_string());
output.push('\n'); output.push('\n');
output.push('\n'); output.push('\n');
} }

View file

@ -5,7 +5,7 @@
use itertools::Itertools; use itertools::Itertools;
use strum::IntoEnumIterator; use strum::IntoEnumIterator;
use ruff_diagnostics::FixKind; use ruff_diagnostics::FixAvailability;
use ruff_linter::registry::{Linter, Rule, RuleNamespace}; use ruff_linter::registry::{Linter, Rule, RuleNamespace};
use ruff_linter::upstream_categories::UpstreamCategoryAndPrefix; use ruff_linter::upstream_categories::UpstreamCategoryAndPrefix;
use ruff_workspace::options::Options; use ruff_workspace::options::Options;
@ -21,10 +21,10 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
table_out.push('\n'); table_out.push('\n');
for rule in rules { for rule in rules {
let fix_token = match rule.fixable() { let fix_token = match rule.fixable() {
FixKind::Always | FixKind::Sometimes => { FixAvailability::Always | FixAvailability::Sometimes => {
format!("<span style='opacity: 1'>{FIX_SYMBOL}</span>") format!("<span style='opacity: 1'>{FIX_SYMBOL}</span>")
} }
FixKind::None => format!("<span style='opacity: 0.1'>{FIX_SYMBOL}</span>"), FixAvailability::None => format!("<span style='opacity: 0.1'>{FIX_SYMBOL}</span>"),
}; };
let preview_token = if rule.is_preview() || rule.is_nursery() { let preview_token = if rule.is_preview() || rule.is_nursery() {
format!("<span style='opacity: 1'>{PREVIEW_SYMBOL}</span>") format!("<span style='opacity: 1'>{PREVIEW_SYMBOL}</span>")

View file

@ -2,7 +2,7 @@ pub use diagnostic::{Diagnostic, DiagnosticKind};
pub use edit::Edit; pub use edit::Edit;
pub use fix::{Applicability, Fix, IsolationLevel}; pub use fix::{Applicability, Fix, IsolationLevel};
pub use source_map::{SourceMap, SourceMarker}; pub use source_map::{SourceMap, SourceMarker};
pub use violation::{AlwaysFixableViolation, FixKind, Violation}; pub use violation::{AlwaysFixableViolation, FixAvailability, Violation};
mod diagnostic; mod diagnostic;
mod edit; mod edit;

View file

@ -1,26 +1,26 @@
use std::fmt::{Debug, Display}; use std::fmt::{Debug, Display};
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub enum FixKind { pub enum FixAvailability {
Sometimes, Sometimes,
Always, Always,
None, None,
} }
impl Display for FixKind { impl Display for FixAvailability {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
FixKind::Sometimes => write!(f, "Fix is sometimes available."), FixAvailability::Sometimes => write!(f, "Fix is sometimes available."),
FixKind::Always => write!(f, "Fix is always available."), FixAvailability::Always => write!(f, "Fix is always available."),
FixKind::None => write!(f, "Fix is not available."), FixAvailability::None => write!(f, "Fix is not available."),
} }
} }
} }
pub trait Violation: Debug + PartialEq + Eq { pub trait Violation: Debug + PartialEq + Eq {
/// `None` in the case an fix is never available or otherwise Some /// `None` in the case an fix is never available or otherwise Some
/// [`FixKind`] describing the available fix. /// [`FixAvailability`] describing the available fix.
const FIX_KIND: FixKind = FixKind::None; const FIX_AVAILABILITY: FixAvailability = FixAvailability::None;
/// The message used to describe the violation. /// The message used to describe the violation.
fn message(&self) -> String; fn message(&self) -> String;
@ -65,7 +65,7 @@ pub trait AlwaysFixableViolation: Debug + PartialEq + Eq {
/// A blanket implementation. /// A blanket implementation.
impl<V: AlwaysFixableViolation> Violation for V { impl<V: AlwaysFixableViolation> Violation for V {
const FIX_KIND: FixKind = FixKind::Always; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
fn message(&self) -> String { fn message(&self) -> String {
<Self as AlwaysFixableViolation>::message(self) <Self as AlwaysFixableViolation>::message(self)

View file

@ -1,5 +1,5 @@
use ast::call_path::{from_qualified_name, CallPath}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::is_docstring_stmt; use ruff_python_ast::helpers::is_docstring_stmt;
use ruff_python_ast::{self as ast, Expr, Parameter, ParameterWithDefault}; use ruff_python_ast::{self as ast, Expr, Parameter, ParameterWithDefault};
@ -64,7 +64,7 @@ use crate::registry::AsRule;
pub struct MutableArgumentDefault; pub struct MutableArgumentDefault;
impl Violation for MutableArgumentDefault { impl Violation for MutableArgumentDefault {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use ruff_python_ast::{self as ast, Constant, Expr}; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -37,7 +37,7 @@ use crate::registry::AsRule;
pub struct UnreliableCallableCheck; pub struct UnreliableCallableCheck;
impl Violation for UnreliableCallableCheck { impl Violation for UnreliableCallableCheck {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::visitor::Visitor; use ruff_python_ast::visitor::Visitor;
use ruff_python_ast::{self as ast, Expr}; use ruff_python_ast::{self as ast, Expr};
@ -56,7 +56,7 @@ pub struct UnusedLoopControlVariable {
} }
impl Violation for UnusedLoopControlVariable { impl Violation for UnusedLoopControlVariable {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Expr, Keyword}; use ruff_python_ast::{self as ast, Expr, Keyword};
use ruff_diagnostics::Violation; use ruff_diagnostics::Violation;
use ruff_diagnostics::{Diagnostic, FixKind}; use ruff_diagnostics::{Diagnostic, FixAvailability};
use ruff_macros::{derive_message_formats, violation}; use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::any_over_expr; use ruff_python_ast::helpers::any_over_expr;
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -44,7 +44,7 @@ use crate::rules::flake8_comprehensions::fixes;
pub struct UnnecessaryComprehensionAnyAll; pub struct UnnecessaryComprehensionAnyAll;
impl Violation for UnnecessaryComprehensionAnyAll { impl Violation for UnnecessaryComprehensionAnyAll {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use std::fmt; use std::fmt;
use ruff_diagnostics::{Diagnostic, Fix}; use ruff_diagnostics::{Diagnostic, Fix};
use ruff_diagnostics::{FixKind, Violation}; use ruff_diagnostics::{FixAvailability, Violation};
use ruff_macros::{derive_message_formats, violation}; use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::visitor; use ruff_python_ast::visitor;
use ruff_python_ast::visitor::Visitor; use ruff_python_ast::visitor::Visitor;
@ -47,7 +47,7 @@ pub struct UnnecessaryMap {
} }
impl Violation for UnnecessaryMap { impl Violation for UnnecessaryMap {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Arguments, Constant, Expr, ExprContext, Stmt}; use ruff_python_ast::{self as ast, Arguments, Constant, Expr, ExprContext, Stmt};
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::whitespace; use ruff_python_ast::whitespace;
use ruff_python_codegen::{Generator, Stylist}; use ruff_python_codegen::{Generator, Stylist};
@ -50,7 +50,7 @@ use crate::registry::{AsRule, Rule};
pub struct RawStringInException; pub struct RawStringInException;
impl Violation for RawStringInException { impl Violation for RawStringInException {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -104,7 +104,7 @@ impl Violation for RawStringInException {
pub struct FStringInException; pub struct FStringInException;
impl Violation for FStringInException { impl Violation for FStringInException {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -160,7 +160,7 @@ impl Violation for FStringInException {
pub struct DotFormatInException; pub struct DotFormatInException;
impl Violation for DotFormatInException { impl Violation for DotFormatInException {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use ruff_python_parser::lexer::LexResult;
use ruff_python_parser::Tok; use ruff_python_parser::Tok;
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_ast::str::{leading_quote, trailing_quote};
use ruff_python_index::Indexer; use ruff_python_index::Indexer;
@ -36,7 +36,7 @@ use crate::rules::flake8_implicit_str_concat::settings::Settings;
pub struct SingleLineImplicitStringConcatenation; pub struct SingleLineImplicitStringConcatenation;
impl Violation for SingleLineImplicitStringConcatenation { impl Violation for SingleLineImplicitStringConcatenation {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_semantic::{Binding, Imported}; use ruff_python_semantic::{Binding, Imported};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -37,7 +37,7 @@ pub struct UnconventionalImportAlias {
} }
impl Violation for UnconventionalImportAlias { impl Violation for UnconventionalImportAlias {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast as ast; use ruff_python_ast as ast;
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -41,7 +41,7 @@ use crate::registry::AsRule;
pub struct DirectLoggerInstantiation; pub struct DirectLoggerInstantiation;
impl Violation for DirectLoggerInstantiation { impl Violation for DirectLoggerInstantiation {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Expr}; use ruff_python_ast::{self as ast, Expr};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -44,7 +44,7 @@ use crate::registry::AsRule;
pub struct InvalidGetLoggerArgument; pub struct InvalidGetLoggerArgument;
impl Violation for InvalidGetLoggerArgument { impl Violation for InvalidGetLoggerArgument {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use ruff_python_ast::Expr; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -36,7 +36,7 @@ use crate::registry::AsRule;
pub struct UndocumentedWarn; pub struct UndocumentedWarn;
impl Violation for UndocumentedWarn { impl Violation for UndocumentedWarn {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
format!("Use of undocumented `logging.WARN` constant") format!("Use of undocumented `logging.WARN` constant")

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Expr, ExprLambda}; use ruff_python_ast::{self as ast, Expr, ExprLambda};
use ruff_diagnostics::{Diagnostic, Edit, Fix}; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -40,7 +40,7 @@ use crate::registry::AsRule;
pub struct ReimplementedListBuiltin; pub struct ReimplementedListBuiltin;
impl Violation for ReimplementedListBuiltin { impl Violation for ReimplementedListBuiltin {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -5,7 +5,7 @@ use std::collections::HashSet;
use crate::checkers::ast::Checker; use crate::checkers::ast::Checker;
use crate::registry::AsRule; use crate::registry::AsRule;
use crate::rules::flake8_pyi::helpers::traverse_union; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::comparable::ComparableExpr;
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -34,7 +34,7 @@ pub struct DuplicateUnionMember {
} }
impl Violation for DuplicateUnionMember { impl Violation for DuplicateUnionMember {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::{Constant, Expr, ExprConstant, Stmt, StmtExpr}; use ruff_python_ast::{Constant, Expr, ExprConstant, Stmt, StmtExpr};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -31,7 +31,7 @@ use crate::registry::AsRule;
pub struct EllipsisInNonEmptyClassBody; pub struct EllipsisInNonEmptyClassBody;
impl Violation for EllipsisInNonEmptyClassBody { impl Violation for EllipsisInNonEmptyClassBody {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -6,7 +6,7 @@ use ruff_python_ast::{
}; };
use smallvec::SmallVec; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::is_const_none; use ruff_python_ast::helpers::is_const_none;
use ruff_python_semantic::SemanticModel; use ruff_python_semantic::SemanticModel;
@ -49,7 +49,7 @@ pub struct BadExitAnnotation {
} }
impl Violation for BadExitAnnotation { impl Violation for BadExitAnnotation {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_semantic::Imported; use ruff_python_semantic::Imported;
use ruff_python_semantic::{Binding, BindingKind}; use ruff_python_semantic::{Binding, BindingKind};
@ -33,7 +33,7 @@ use crate::renamer::Renamer;
pub struct UnaliasedCollectionsAbcSetImport; pub struct UnaliasedCollectionsAbcSetImport;
impl Violation for UnaliasedCollectionsAbcSetImport { impl Violation for UnaliasedCollectionsAbcSetImport {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -7,7 +7,7 @@ use libcst_native::{
SimpleWhitespace, SmallStatement, Statement, TrailingWhitespace, 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::Truthiness; use ruff_python_ast::helpers::Truthiness;
use ruff_python_ast::parenthesize::parenthesized_range; use ruff_python_ast::parenthesize::parenthesized_range;
@ -62,7 +62,7 @@ use super::unittest_assert::UnittestAssert;
pub struct PytestCompositeAssertion; pub struct PytestCompositeAssertion;
impl Violation for PytestCompositeAssertion { impl Violation for PytestCompositeAssertion {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -192,7 +192,7 @@ pub struct PytestUnittestAssertion {
} }
impl Violation for PytestUnittestAssertion { impl Violation for PytestUnittestAssertion {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -354,7 +354,7 @@ pub struct PytestUnittestRaisesAssertion {
} }
impl Violation for PytestUnittestRaisesAssertion { impl Violation for PytestUnittestRaisesAssertion {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -2,7 +2,7 @@ use std::hash::BuildHasherDefault;
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::comparable::ComparableExpr;
use ruff_python_ast::node::AstNode; use ruff_python_ast::node::AstNode;
@ -77,7 +77,7 @@ pub struct PytestParametrizeNamesWrongType {
} }
impl Violation for PytestParametrizeNamesWrongType { impl Violation for PytestParametrizeNamesWrongType {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -234,7 +234,7 @@ pub struct PytestDuplicateParametrizeTestCases {
} }
impl Violation for PytestDuplicateParametrizeTestCases { impl Violation for PytestDuplicateParametrizeTestCases {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -7,7 +7,7 @@ use ruff_python_ast::{self as ast, Arguments, BoolOp, CmpOp, Expr, ExprContext,
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::comparable::ComparableExpr;
use ruff_python_ast::helpers::{contains_effect, Truthiness}; use ruff_python_ast::helpers::{contains_effect, Truthiness};
@ -49,7 +49,7 @@ pub struct DuplicateIsinstanceCall {
} }
impl Violation for DuplicateIsinstanceCall { impl Violation for DuplicateIsinstanceCall {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -2,7 +2,7 @@ use ruff_python_ast::{self as ast, Arguments, Constant, Expr};
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
use crate::fix::snippet::SourceCodeSnippet; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::is_const_none; use ruff_python_ast::helpers::is_const_none;
@ -41,7 +41,7 @@ pub struct UncapitalizedEnvironmentVariables {
} }
impl Violation for UncapitalizedEnvironmentVariables { impl Violation for UncapitalizedEnvironmentVariables {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -5,7 +5,7 @@ use ruff_python_ast::{
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
use rustc_hash::FxHashSet; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::comparable::{ComparableConstant, ComparableExpr, ComparableStmt}; use ruff_python_ast::comparable::{ComparableConstant, ComparableExpr, ComparableStmt};
use ruff_python_ast::helpers::{any_over_expr, contains_effect}; 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; pub struct CollapsibleIf;
impl Violation for CollapsibleIf { impl Violation for CollapsibleIf {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -96,7 +96,7 @@ pub struct NeedlessBool {
} }
impl Violation for NeedlessBool { impl Violation for NeedlessBool {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -168,7 +168,7 @@ pub struct IfElseBlockInsteadOfIfExp {
} }
impl Violation for IfElseBlockInsteadOfIfExp { impl Violation for IfElseBlockInsteadOfIfExp {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -242,7 +242,7 @@ pub struct IfElseBlockInsteadOfDictGet {
} }
impl Violation for IfElseBlockInsteadOfDictGet { impl Violation for IfElseBlockInsteadOfDictGet {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Arguments, Expr, ExprContext, UnaryOp}; use ruff_python_ast::{self as ast, Arguments, Expr, ExprContext, UnaryOp};
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::{is_const_false, is_const_true}; use ruff_python_ast::helpers::{is_const_false, is_const_true};
use ruff_python_ast::parenthesize::parenthesized_range; use ruff_python_ast::parenthesize::parenthesized_range;
@ -35,7 +35,7 @@ pub struct IfExprWithTrueFalse {
} }
impl Violation for IfExprWithTrueFalse { impl Violation for IfExprWithTrueFalse {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use log::error; use log::error;
use ruff_diagnostics::{Diagnostic, Fix}; use ruff_diagnostics::{Diagnostic, Fix};
use ruff_diagnostics::{FixKind, Violation}; use ruff_diagnostics::{FixAvailability, Violation};
use ruff_macros::{derive_message_formats, violation}; use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Stmt, WithItem}; use ruff_python_ast::{self as ast, Stmt, WithItem};
use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer}; use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
@ -45,7 +45,7 @@ use super::fix_with;
pub struct MultipleWithStatements; pub struct MultipleWithStatements;
impl Violation for MultipleWithStatements { impl Violation for MultipleWithStatements {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use ruff_python_ast::{
}; };
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::any_over_expr; use ruff_python_ast::helpers::any_over_expr;
use ruff_python_ast::traversal; use ruff_python_ast::traversal;
@ -43,7 +43,7 @@ pub struct ReimplementedBuiltin {
} }
impl Violation for ReimplementedBuiltin { impl Violation for ReimplementedBuiltin {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::call_path::compose_call_path; use ruff_python_ast::call_path::compose_call_path;
use ruff_python_ast::helpers; use ruff_python_ast::helpers;
@ -48,7 +48,7 @@ pub struct SuppressibleException {
} }
impl Violation for SuppressibleException { impl Violation for SuppressibleException {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use anyhow::Result; use anyhow::Result;
use libcst_native::CompOp; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, CmpOp, Expr, UnaryOp}; use ruff_python_ast::{self as ast, CmpOp, Expr, UnaryOp};
use ruff_python_codegen::Stylist; use ruff_python_codegen::Stylist;
@ -52,7 +52,7 @@ pub struct YodaConditions {
} }
impl Violation for YodaConditions { impl Violation for YodaConditions {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Identifier, Stmt}; use ruff_python_ast::{self as ast, Identifier, Stmt};
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::resolve_imported_module_path; use ruff_python_ast::helpers::resolve_imported_module_path;
use ruff_python_codegen::Generator; use ruff_python_codegen::Generator;
@ -51,7 +51,7 @@ pub struct RelativeImports {
} }
impl Violation for RelativeImports { impl Violation for RelativeImports {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use std::borrow::Cow;
use anyhow::Result; use anyhow::Result;
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_semantic::{AnyImport, Imported, NodeId, ResolvedReferenceId, Scope}; use ruff_python_semantic::{AnyImport, Imported, NodeId, ResolvedReferenceId, Scope};
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
@ -49,7 +49,7 @@ pub struct RuntimeImportInTypeCheckingBlock {
} }
impl Violation for RuntimeImportInTypeCheckingBlock { impl Violation for RuntimeImportInTypeCheckingBlock {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use std::borrow::Cow;
use anyhow::Result; use anyhow::Result;
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_semantic::{AnyImport, Binding, Imported, NodeId, ResolvedReferenceId, Scope}; use ruff_python_semantic::{AnyImport, Binding, Imported, NodeId, ResolvedReferenceId, Scope};
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
@ -67,7 +67,7 @@ pub struct TypingOnlyFirstPartyImport {
} }
impl Violation for TypingOnlyFirstPartyImport { impl Violation for TypingOnlyFirstPartyImport {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -135,7 +135,7 @@ pub struct TypingOnlyThirdPartyImport {
} }
impl Violation for TypingOnlyThirdPartyImport { impl Violation for TypingOnlyThirdPartyImport {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -203,7 +203,7 @@ pub struct TypingOnlyStandardLibraryImport {
} }
impl Violation for TypingOnlyStandardLibraryImport { impl Violation for TypingOnlyStandardLibraryImport {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -2,7 +2,7 @@ use std::path::Path;
use itertools::{EitherOrBoth, Itertools}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::whitespace::trailing_lines_end; use ruff_python_ast::whitespace::trailing_lines_end;
use ruff_python_ast::{PySourceType, Stmt}; use ruff_python_ast::{PySourceType, Stmt};
@ -41,7 +41,7 @@ use super::super::{comments, format_imports};
pub struct UnsortedImports; pub struct UnsortedImports;
impl Violation for UnsortedImports { impl Violation for UnsortedImports {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::Expr; use ruff_python_ast::Expr;
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -37,7 +37,7 @@ pub struct NumpyDeprecatedFunction {
} }
impl Violation for NumpyDeprecatedFunction { impl Violation for NumpyDeprecatedFunction {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::Expr; use ruff_python_ast::Expr;
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -34,7 +34,7 @@ pub struct NumpyDeprecatedTypeAlias {
} }
impl Violation for NumpyDeprecatedTypeAlias { impl Violation for NumpyDeprecatedTypeAlias {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::is_const_true; use ruff_python_ast::helpers::is_const_true;
use ruff_python_ast::parenthesize::parenthesized_range; use ruff_python_ast::parenthesize::parenthesized_range;
@ -39,7 +39,7 @@ use crate::registry::AsRule;
pub struct PandasUseOfInplaceArgument; pub struct PandasUseOfInplaceArgument;
impl Violation for PandasUseOfInplaceArgument { impl Violation for PandasUseOfInplaceArgument {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use ruff_python_ast::{
}; };
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use ruff_python_codegen::Generator; use ruff_python_codegen::Generator;
use ruff_python_semantic::SemanticModel; use ruff_python_semantic::SemanticModel;
@ -42,7 +42,7 @@ pub struct LambdaAssignment {
} }
impl Violation for LambdaAssignment { impl Violation for LambdaAssignment {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_source_file::{UniversalNewlineIterator, UniversalNewlines}; use ruff_source_file::{UniversalNewlineIterator, UniversalNewlines};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -47,7 +47,7 @@ pub struct BlankLineAfterSummary {
} }
impl Violation for BlankLineAfterSummary { impl Violation for BlankLineAfterSummary {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_source_file::NewlineWithTrailingNewline; use ruff_source_file::NewlineWithTrailingNewline;
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -35,7 +35,7 @@ use crate::rules::pydocstyle::helpers::ends_with_backslash;
pub struct SurroundingWhitespace; pub struct SurroundingWhitespace;
impl Violation for SurroundingWhitespace { impl Violation for SurroundingWhitespace {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_ast::str::{leading_quote, trailing_quote};
use ruff_source_file::NewlineWithTrailingNewline; use ruff_source_file::NewlineWithTrailingNewline;
@ -37,7 +37,7 @@ use crate::registry::AsRule;
pub struct FitsOnOneLine; pub struct FitsOnOneLine;
impl Violation for FitsOnOneLine { impl Violation for FitsOnOneLine {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use ruff_python_ast::{self as ast, Expr}; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -39,7 +39,7 @@ use crate::registry::AsRule;
pub struct RaiseNotImplemented; pub struct RaiseNotImplemented;
impl Violation for RaiseNotImplemented { impl Violation for RaiseNotImplemented {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -2,7 +2,7 @@ use std::hash::BuildHasherDefault;
use rustc_hash::{FxHashMap, FxHashSet}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::comparable::ComparableExpr;
use ruff_python_ast::parenthesize::parenthesized_range; use ruff_python_ast::parenthesize::parenthesized_range;
@ -49,7 +49,7 @@ pub struct MultiValueRepeatedKeyLiteral {
} }
impl Violation for MultiValueRepeatedKeyLiteral { impl Violation for MultiValueRepeatedKeyLiteral {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -106,7 +106,7 @@ pub struct MultiValueRepeatedKeyVariable {
} }
impl Violation for MultiValueRepeatedKeyVariable { impl Violation for MultiValueRepeatedKeyVariable {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -2,7 +2,7 @@ use std::string::ToString;
use rustc_hash::FxHashSet; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Constant, Expr, Identifier, Keyword}; use ruff_python_ast::{self as ast, Constant, Expr, Identifier, Keyword};
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
@ -387,7 +387,7 @@ pub struct StringDotFormatExtraNamedArguments {
} }
impl Violation for StringDotFormatExtraNamedArguments { impl Violation for StringDotFormatExtraNamedArguments {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {
@ -428,7 +428,7 @@ pub struct StringDotFormatExtraPositionalArguments {
} }
impl Violation for StringDotFormatExtraPositionalArguments { impl Violation for StringDotFormatExtraPositionalArguments {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use std::borrow::Cow;
use anyhow::Result; use anyhow::Result;
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_semantic::{AnyImport, Exceptions, Imported, NodeId, Scope}; use ruff_python_semantic::{AnyImport, Exceptions, Imported, NodeId, Scope};
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
@ -67,7 +67,7 @@ pub struct UnusedImport {
} }
impl Violation for UnusedImport { impl Violation for UnusedImport {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use itertools::Itertools; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::contains_effect; use ruff_python_ast::helpers::contains_effect;
use ruff_python_ast::parenthesize::parenthesized_range; use ruff_python_ast::parenthesize::parenthesized_range;
@ -48,7 +48,7 @@ pub struct UnusedVariable {
} }
impl Violation for UnusedVariable { impl Violation for UnusedVariable {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Alias, Identifier, Stmt}; use ruff_python_ast::{self as ast, Alias, Identifier, Stmt};
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use crate::checkers::ast::Checker; use crate::checkers::ast::Checker;
@ -33,7 +33,7 @@ pub struct ManualFromImport {
} }
impl Violation for ManualFromImport { impl Violation for ManualFromImport {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Arguments, Expr, Keyword}; use ruff_python_ast::{self as ast, Arguments, Expr, Keyword};
use ruff_text_size::{Ranged, TextRange}; 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_macros::{derive_message_formats, violation};
use ruff_python_semantic::SemanticModel; use ruff_python_semantic::SemanticModel;
@ -43,7 +43,7 @@ pub struct NestedMinMax {
} }
impl Violation for NestedMinMax { impl Violation for NestedMinMax {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]

View file

@ -1,6 +1,6 @@
use ruff_python_ast::{self as ast, Expr}; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -43,7 +43,7 @@ pub struct SysExitAlias {
} }
impl Violation for SysExitAlias { impl Violation for SysExitAlias {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use log::debug; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::is_dunder; use ruff_python_ast::helpers::is_dunder;
use ruff_python_ast::{ use ruff_python_ast::{
@ -50,7 +50,7 @@ pub struct ConvertNamedTupleFunctionalToClass {
} }
impl Violation for ConvertNamedTupleFunctionalToClass { impl Violation for ConvertNamedTupleFunctionalToClass {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::is_dunder; use ruff_python_ast::helpers::is_dunder;
use ruff_python_ast::{ use ruff_python_ast::{
@ -47,7 +47,7 @@ pub struct ConvertTypedDictFunctionalToClass {
} }
impl Violation for ConvertTypedDictFunctionalToClass { impl Violation for ConvertTypedDictFunctionalToClass {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use ruff_python_ast::Expr; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -38,7 +38,7 @@ use crate::registry::AsRule;
pub struct DatetimeTimezoneUTC; pub struct DatetimeTimezoneUTC;
impl Violation for DatetimeTimezoneUTC { impl Violation for DatetimeTimezoneUTC {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use itertools::Itertools; use itertools::Itertools;
use ruff_python_ast::{Alias, Stmt}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::whitespace::indentation; use ruff_python_ast::whitespace::indentation;
use ruff_python_codegen::Stylist; use ruff_python_codegen::Stylist;
@ -66,7 +66,7 @@ pub struct DeprecatedImport {
} }
impl Violation for DeprecatedImport { impl Violation for DeprecatedImport {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use std::borrow::Cow;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use rustc_hash::FxHashMap; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_ast::str::{leading_quote, trailing_quote};
use ruff_python_ast::{self as ast, Constant, Expr, Keyword}; use ruff_python_ast::{self as ast, Constant, Expr, Keyword};
@ -44,7 +44,7 @@ use crate::rules::pyupgrade::helpers::curly_escape;
pub struct FString; pub struct FString;
impl Violation for FString { impl Violation for FString {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -3,7 +3,7 @@ use libcst_native::{Arg, Expression};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Expr}; use ruff_python_ast::{self as ast, Expr};
use ruff_python_codegen::Stylist; use ruff_python_codegen::Stylist;
@ -46,7 +46,7 @@ use crate::rules::pyflakes::format::FormatSummary;
pub struct FormatLiterals; pub struct FormatLiterals;
impl Violation for FormatLiterals { impl Violation for FormatLiterals {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use ruff_python_ast::Expr; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -34,7 +34,7 @@ use crate::registry::AsRule;
pub struct OpenAlias; pub struct OpenAlias;
impl Violation for OpenAlias { impl Violation for OpenAlias {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use std::cmp::Ordering; use std::cmp::Ordering;
use anyhow::Result; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::stmt_if::{if_elif_branches, BranchKind, IfElifBranch}; use ruff_python_ast::stmt_if::{if_elif_branches, BranchKind, IfElifBranch};
use ruff_python_ast::whitespace::indentation; use ruff_python_ast::whitespace::indentation;
@ -51,7 +51,7 @@ pub struct OutdatedVersionBlock {
} }
impl Violation for OutdatedVersionBlock { impl Violation for OutdatedVersionBlock {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use std::str::FromStr; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_ast::str::{leading_quote, trailing_quote};
use ruff_python_ast::whitespace::indentation; use ruff_python_ast::whitespace::indentation;
@ -68,7 +68,7 @@ use crate::rules::pyupgrade::helpers::curly_escape;
pub struct PrintfStringFormatting; pub struct PrintfStringFormatting;
impl Violation for PrintfStringFormatting { impl Violation for PrintfStringFormatting {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use anyhow::Result; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Keyword}; use ruff_python_ast::{self as ast, Keyword};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -40,7 +40,7 @@ use crate::registry::AsRule;
pub struct ReplaceStdoutStderr; pub struct ReplaceStdoutStderr;
impl Violation for ReplaceStdoutStderr { impl Violation for ReplaceStdoutStderr {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use ruff_python_ast::{self as ast, Expr}; use ruff_python_ast::{self as ast, Expr};
use crate::fix::edits::pad; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -37,7 +37,7 @@ pub struct TypeOfPrimitive {
} }
impl Violation for TypeOfPrimitive { impl Violation for TypeOfPrimitive {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use ruff_python_ast::Expr; 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_macros::{derive_message_formats, violation};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
@ -33,7 +33,7 @@ use crate::registry::AsRule;
pub struct TypingTextStrAlias; pub struct TypingTextStrAlias;
impl Violation for TypingTextStrAlias { impl Violation for TypingTextStrAlias {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use ruff_python_ast::Expr; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::call_path::compose_call_path; use ruff_python_ast::call_path::compose_call_path;
use ruff_python_semantic::analyze::typing::ModuleMember; use ruff_python_semantic::analyze::typing::ModuleMember;
@ -56,7 +56,7 @@ pub struct NonPEP585Annotation {
} }
impl Violation for NonPEP585Annotation { impl Violation for NonPEP585Annotation {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Constant, Expr, ExprContext, Operator}; use ruff_python_ast::{self as ast, Constant, Expr, ExprContext, Operator};
use ruff_python_semantic::analyze::typing::Pep604Operator; use ruff_python_semantic::analyze::typing::Pep604Operator;
@ -45,7 +45,7 @@ use crate::registry::AsRule;
pub struct NonPEP604Annotation; pub struct NonPEP604Annotation;
impl Violation for NonPEP604Annotation { impl Violation for NonPEP604Annotation {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,5 +1,5 @@
use ast::{Constant, ExprCall, ExprConstant}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::{ use ruff_python_ast::{
self as ast, self as ast,
@ -49,7 +49,7 @@ pub struct NonPEP695TypeAlias {
} }
impl Violation for NonPEP695TypeAlias { impl Violation for NonPEP695TypeAlias {
const FIX_KIND: FixKind = FixKind::Always; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Expr}; use ruff_python_ast::{self as ast, Expr};
use ruff_python_semantic::analyze::typing::{is_dict, is_list}; 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; pub struct DeleteFullSlice;
impl Violation for DeleteFullSlice { impl Violation for DeleteFullSlice {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Constant, Expr}; use ruff_python_ast::{self as ast, Constant, Expr};
use ruff_python_codegen::Generator; use ruff_python_codegen::Generator;
@ -43,7 +43,7 @@ enum Reason {
} }
impl Violation for PrintEmptyString { impl Violation for PrintEmptyString {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,5 +1,5 @@
use anyhow::{bail, Result}; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::comparable::ComparableExpr; use ruff_python_ast::comparable::ComparableExpr;
use ruff_python_ast::{self as ast, Expr}; use ruff_python_ast::{self as ast, Expr};
@ -57,7 +57,7 @@ use crate::registry::AsRule;
pub struct ReimplementedStarmap; pub struct ReimplementedStarmap;
impl Violation for ReimplementedStarmap { impl Violation for ReimplementedStarmap {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,7 +1,7 @@
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use ast::traversal; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Expr, Stmt}; use ruff_python_ast::{self as ast, Expr, Stmt};
use ruff_python_codegen::Generator; use ruff_python_codegen::Generator;
@ -60,7 +60,7 @@ impl RepeatedAppend {
} }
impl Violation for RepeatedAppend { impl Violation for RepeatedAppend {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Expr}; use ruff_python_ast::{self as ast, Expr};
use ruff_python_semantic::analyze::typing::is_list; use ruff_python_semantic::analyze::typing::is_list;
@ -39,7 +39,7 @@ use crate::rules::refurb::helpers::generate_method_call;
pub struct SliceCopy; pub struct SliceCopy;
impl Violation for SliceCopy { impl Violation for SliceCopy {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,6 +1,6 @@
use std::fmt; 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_macros::{derive_message_formats, violation};
use ruff_python_ast as ast; use ruff_python_ast as ast;
use ruff_python_ast::{Arguments, Constant, Expr, Int}; use ruff_python_ast::{Arguments, Constant, Expr, Int};
@ -51,7 +51,7 @@ pub struct UnnecessaryEnumerate {
} }
impl Violation for UnnecessaryEnumerate { impl Violation for UnnecessaryEnumerate {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -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_macros::{derive_message_formats, violation};
use ruff_python_ast::{self as ast, Expr, ExprContext, Operator}; use ruff_python_ast::{self as ast, Expr, ExprContext, Operator};
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
@ -43,7 +43,7 @@ pub struct CollectionLiteralConcatenation {
} }
impl Violation for CollectionLiteralConcatenation { impl Violation for CollectionLiteralConcatenation {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -2,7 +2,7 @@ use std::fmt;
use anyhow::Result; 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_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers::is_const_none; use ruff_python_ast::helpers::is_const_none;
use ruff_python_ast::{self as ast, Constant, Expr, Operator, ParameterWithDefault, Parameters}; use ruff_python_ast::{self as ast, Constant, Expr, Operator, ParameterWithDefault, Parameters};
@ -80,7 +80,7 @@ pub struct ImplicitOptional {
} }
impl Violation for ImplicitOptional { impl Violation for ImplicitOptional {
const FIX_KIND: FixKind = FixKind::Sometimes; const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -1,4 +1,4 @@
use ruff_diagnostics::{FixKind, Violation}; use ruff_diagnostics::{FixAvailability, Violation};
use ruff_macros::{derive_message_formats, violation}; use ruff_macros::{derive_message_formats, violation};
/// ## What it does /// ## What it does
@ -36,7 +36,7 @@ pub struct InvalidPyprojectToml {
} }
impl Violation for InvalidPyprojectToml { impl Violation for InvalidPyprojectToml {
const FIX_KIND: FixKind = FixKind::None; const FIX_AVAILABILITY: FixAvailability = FixAvailability::None;
#[derive_message_formats] #[derive_message_formats]
fn message(&self) -> String { fn message(&self) -> String {

View file

@ -9,7 +9,7 @@ use anyhow::Result;
use itertools::Itertools; use itertools::Itertools;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use ruff_diagnostics::{Diagnostic, FixKind}; use ruff_diagnostics::{Diagnostic, FixAvailability};
use ruff_python_ast::PySourceType; use ruff_python_ast::PySourceType;
use ruff_python_codegen::Stylist; use ruff_python_codegen::Stylist;
use ruff_python_index::Indexer; use ruff_python_index::Indexer;
@ -239,15 +239,15 @@ Source with applied fixes:
let fixable = diagnostic.fix.is_some(); let fixable = diagnostic.fix.is_some();
match (fixable, rule.fixable()) { match (fixable, rule.fixable()) {
(true, FixKind::Sometimes | FixKind::Always) (true, FixAvailability::Sometimes | FixAvailability::Always)
| (false, FixKind::None | FixKind::Sometimes) => { | (false, FixAvailability::None | FixAvailability::Sometimes) => {
// Ok // Ok
} }
(true, FixKind::None) => { (true, FixAvailability::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`"); 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) => { (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_KINDd` to either `FixKind::Sometimes` or `FixKind::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")
} }
} }

View file

@ -405,7 +405,7 @@ fn register_rules<'a>(input: impl Iterator<Item = &'a Rule>) -> TokenStream {
rule_message_formats_match_arms rule_message_formats_match_arms
.extend(quote! {#(#attrs)* Self::#name => <#path as ruff_diagnostics::Violation>::message_formats(),}); .extend(quote! {#(#attrs)* Self::#name => <#path as ruff_diagnostics::Violation>::message_formats(),});
rule_fixable_match_arms.extend( 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 rule_explanation_match_arms
.extend(quote! {#(#attrs)* Self::#name => #path::explanation(),}); .extend(quote! {#(#attrs)* Self::#name => #path::explanation(),});
@ -448,7 +448,7 @@ fn register_rules<'a>(input: impl Iterator<Item = &'a Rule>) -> TokenStream {
} }
/// Returns the fix status of this rule. /// 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 } match self { #rule_fixable_match_arms }
} }
} }