language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-26 11:59:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[red-knot] Computing a type ordering for two non-normalized types is meaningless (#17734)

Browse source
This commit is contained in:
Alex Waygood 2025-04-30 11:58:55 +01:00 • committed by GitHub
parent d94be0e780
commit b84b58760e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/red_knot_python_semantic/src/types/type_ordering.rs
View file

@ -26,6 +26,17 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
left: &Type<'db>, left: &Type<'db>,
right: &Type<'db>, right: &Type<'db>,
) -> Ordering { ) -> Ordering {
debug_assert_eq!(
*left,
left.normalized(db),
"`left` must be normalized before a meaningful ordering can be established"
);
debug_assert_eq!(
*right,
right.normalized(db),
"`right` must be normalized before a meaningful ordering can be established"
);
if left == right { if left == right {
return Ordering::Equal; return Ordering::Equal;
} }
@ -85,19 +96,11 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
(Type::DataclassTransformer(_), _) => Ordering::Less, (Type::DataclassTransformer(_), _) => Ordering::Less,
(_, Type::DataclassTransformer(_)) => Ordering::Greater, (_, Type::DataclassTransformer(_)) => Ordering::Greater,
(Type::Callable(left), Type::Callable(right)) => { (Type::Callable(left), Type::Callable(right)) => left.cmp(right),
debug_assert_eq!(*left, left.normalized(db));
debug_assert_eq!(*right, right.normalized(db));
left.cmp(right)
}
(Type::Callable(_), _) => Ordering::Less, (Type::Callable(_), _) => Ordering::Less,
(_, Type::Callable(_)) => Ordering::Greater, (_, Type::Callable(_)) => Ordering::Greater,
(Type::Tuple(left), Type::Tuple(right)) => { (Type::Tuple(left), Type::Tuple(right)) => left.cmp(right),
debug_assert_eq!(*left, left.normalized(db));
debug_assert_eq!(*right, right.normalized(db));
left.cmp(right)
}
(Type::Tuple(_), _) => Ordering::Less, (Type::Tuple(_), _) => Ordering::Less,
(_, Type::Tuple(_)) => Ordering::Greater, (_, Type::Tuple(_)) => Ordering::Greater,
@ -325,13 +328,6 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
} }
(Type::Intersection(left), Type::Intersection(right)) => { (Type::Intersection(left), Type::Intersection(right)) => {
debug_assert_eq!(*left, left.normalized(db));
debug_assert_eq!(*right, right.normalized(db));
if left == right {
return Ordering::Equal;
}
// Lexicographically compare the elements of the two unequal intersections. // Lexicographically compare the elements of the two unequal intersections.
let left_positive = left.positive(db); let left_positive = left.positive(db);
let right_positive = right.positive(db); let right_positive = right.positive(db);
@ -356,7 +352,7 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
} }
} }
unreachable!("Two equal intersections that both have sorted elements should share the same Salsa ID") unreachable!("Two equal, normalized intersections should share the same Salsa ID")
} }
} }
} }