From c610826236082f7f9da6333523bb1ab76d7b7992 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 8 Jun 2023 12:56:43 -0400 Subject: [PATCH] Make SIM118 a suggested fix --- crates/ruff/src/importer/mod.rs | 4 ++-- crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/crates/ruff/src/importer/mod.rs b/crates/ruff/src/importer/mod.rs index aca15cd632d2a..f57fcfafe5525 100644 --- a/crates/ruff/src/importer/mod.rs +++ b/crates/ruff/src/importer/mod.rs @@ -7,14 +7,14 @@ use libcst_native::{ImportAlias, Name, NameOrAttribute}; use ruff_text_size::TextSize; use rustpython_parser::ast::{self, Ranged, Stmt, Suite}; -use crate::autofix; -use crate::autofix::codemods::CodegenStylist; use ruff_diagnostics::Edit; use ruff_python_ast::imports::{AnyImport, Import, ImportFrom}; use ruff_python_ast::source_code::{Locator, Stylist}; use ruff_python_semantic::model::SemanticModel; use ruff_textwrap::indent; +use crate::autofix; +use crate::autofix::codemods::CodegenStylist; use crate::cst::matchers::{match_aliases, match_import_from, match_statement}; use crate::importer::insertion::Insertion; diff --git a/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs b/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs index 8463476e960ba..c5420a72c4337 100644 --- a/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs +++ b/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs @@ -1,15 +1,14 @@ use anyhow::Result; - use log::error; use ruff_text_size::TextRange; use rustpython_parser::ast::{self, Cmpop, Expr, Ranged}; -use crate::autofix::codemods::CodegenStylist; use ruff_diagnostics::Edit; use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix}; use ruff_macros::{derive_message_formats, violation}; use ruff_python_ast::source_code::{Locator, Stylist}; +use crate::autofix::codemods::CodegenStylist; use crate::checkers::ast::Checker; use crate::cst::matchers::{match_attribute, match_call_mut, match_expression}; use crate::registry::AsRule; @@ -86,8 +85,7 @@ fn key_in_dict(checker: &mut Checker, left: &Expr, right: &Expr, range: TextRang range, ); if checker.patch(diagnostic.kind.rule()) { - #[allow(deprecated)] - diagnostic.set_fix(Fix::unspecified(Edit::range_replacement( + diagnostic.set_fix(Fix::suggested(Edit::range_replacement( value_content, right.range(), )));