mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-01 22:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix Ord of cmp_fix (#12471)

Browse source
This commit is contained in:
Micha Reiser 2024-07-23 15:14:22 +02:00 • committed by GitHub
parent f0fc6a95fe
commit 3af6ccb720
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ruff_linter/src/fix/mod.rs
View file

@ -130,14 +130,14 @@ fn apply_fixes<'a>(
/// Compare two fixes. /// Compare two fixes.
fn cmp_fix(rule1: Rule, rule2: Rule, fix1: &Fix, fix2: &Fix) -> std::cmp::Ordering { fn cmp_fix(rule1: Rule, rule2: Rule, fix1: &Fix, fix2: &Fix) -> std::cmp::Ordering {
// Always apply `RedefinedWhileUnused` before `UnusedImport`, as the latter can end up fixing // Always apply `RedefinedWhileUnused` before `UnusedImport`, as the latter can end up fixing
// the former. // the former. But we can't apply this just for `RedefinedWhileUnused` and `UnusedImport` because it violates
{ // `< is transitive: a < b and b < c implies a < c. The same must hold for both == and >.`
// See https://github.com/astral-sh/ruff/issues/12469#issuecomment-2244392085
match (rule1, rule2) { match (rule1, rule2) {
(Rule::RedefinedWhileUnused, Rule::UnusedImport) => return std::cmp::Ordering::Less, (Rule::RedefinedWhileUnused, _) => std::cmp::Ordering::Less,
(Rule::UnusedImport, Rule::RedefinedWhileUnused) => return std::cmp::Ordering::Greater, (_, Rule::RedefinedWhileUnused) => std::cmp::Ordering::Greater,
_ => std::cmp::Ordering::Equal, _ => std::cmp::Ordering::Equal,
} }
}
// Apply fixes in order of their start position. // Apply fixes in order of their start position.
.then_with(|| fix1.min_start().cmp(&fix2.min_start())) .then_with(|| fix1.min_start().cmp(&fix2.min_start()))
// Break ties in the event of overlapping rules, for some specific combinations. // Break ties in the event of overlapping rules, for some specific combinations.