Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove extra `error!` call (#6002)

This commit is contained in:
Charlie Marsh 2023-07-22 22:29:06 -04:00 committed by GitHub
parent 3914fcb7ca
commit 45a24912a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs
View File

@ -1,5 +1,4 @@
use anyhow::Result; use anyhow::Result;
use log::error;
use ruff_text_size::TextRange; use ruff_text_size::TextRange;
use rustpython_parser::ast::{self, CmpOp, Expr, Ranged}; use rustpython_parser::ast::{self, CmpOp, Expr, Ranged};
@ -91,14 +90,9 @@ fn key_in_dict(
// Slice exact content to preserve formatting. // Slice exact content to preserve formatting.
let left_content = checker.locator().slice(left.range()); let left_content = checker.locator().slice(left.range());
let value_content = let Ok(value_content) = value_content_for_key_in_dict(checker.locator(), checker.stylist(), right) else {
match get_value_content_for_key_in_dict(checker.locator(), checker.stylist(), right) { return;
Ok(value_content) => value_content, };
Err(err) => {
error!("Failed to get value content for key in dict: {}", err);
return;
}
};
let mut diagnostic = Diagnostic::new( let mut diagnostic = Diagnostic::new(
InDictKeys { InDictKeys {
@ -151,7 +145,7 @@ pub(crate) fn key_in_dict_compare(
key_in_dict(checker, left, right, *op, expr.range()); key_in_dict(checker, left, right, *op, expr.range());
} }
fn get_value_content_for_key_in_dict( fn value_content_for_key_in_dict(
locator: &Locator, locator: &Locator,
stylist: &Stylist, stylist: &Stylist,
expr: &Expr, expr: &Expr,
@ -160,6 +154,5 @@ fn get_value_content_for_key_in_dict(
let mut expression = match_expression(content)?; let mut expression = match_expression(content)?;
let call = match_call_mut(&mut expression)?; let call = match_call_mut(&mut expression)?;
let attribute = match_attribute(&mut call.func)?; let attribute = match_attribute(&mut call.func)?;
Ok(attribute.value.codegen_stylist(stylist)) Ok(attribute.value.codegen_stylist(stylist))
} }