Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make C413 fix as suggested for reversed call #4891

Merged
merged 3 commits into from Jun 7, 2023
Merged

Make C413 fix as suggested for reversed call #4891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c20baa
Avoid flagging `C413` for `key` is present for `sorted`
dhruvmanila Jun 6, 2023
dbedf75
Revert "Avoid flagging `C413` for `key` is present for `sorted`"
dhruvmanila Jun 7, 2023
3561906
Make `C413` fix suggested for `reversed` call
dhruvmanila Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
View file
Open in desktop
@@ -1,6 +1,6 @@
use rustpython_parser::ast::{self, Expr, Ranged};

use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
use ruff_macros::{derive_message_formats, violation};

use crate::checkers::ast::Checker;
Expand Down Expand Up @@ -85,9 +85,14 @@ pub(crate) fn unnecessary_call_around_sorted(
expr.range(),
);
if checker.patch(diagnostic.kind.rule()) {
#[allow(deprecated)]
diagnostic.try_set_fix_from_edit(|| {
fixes::fix_unnecessary_call_around_sorted(checker.locator, checker.stylist, expr)
diagnostic.try_set_fix(|| {
let edit =
fixes::fix_unnecessary_call_around_sorted(checker.locator, checker.stylist, expr)?;
if outer == "reversed" {
Ok(Fix::suggested(edit))
} else {
Ok(Fix::automatic(edit))
}
});
}
checker.diagnostics.push(diagnostic);
Expand Down
2 changes: 1 addition & 1 deletion ...ke8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C413_C413.py.snap
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ C413.py:3:1: C413 [*] Unnecessary `list` call around `sorted()`
|
= help: Remove unnecessary `list` call

ℹ Suggested fix
ℹ Fix
1 1 | x = [2, 3, 1]
2 2 | list(x)
3 |-list(sorted(x))
Expand Down