Skip to content

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

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

Merged
AlexWaygood merged 1 commit into from
Apr 30, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions crates/red_knot_python_semantic/src/types/type_ordering.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
left: &Type<'db>,
right: &Type<'db>,
) -> 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 {
return Ordering::Equal;
}
Expand Down Expand Up @@ -85,19 +96,11 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
(Type::DataclassTransformer(_), _) => Ordering::Less,
(_, Type::DataclassTransformer(_)) => Ordering::Greater,

(Type::Callable(left), Type::Callable(right)) => {
debug_assert_eq!(*left, left.normalized(db));
debug_assert_eq!(*right, right.normalized(db));
left.cmp(right)
}
(Type::Callable(left), Type::Callable(right)) => left.cmp(right),
(Type::Callable(_), _) => Ordering::Less,
(_, Type::Callable(_)) => Ordering::Greater,

(Type::Tuple(left), Type::Tuple(right)) => {
debug_assert_eq!(*left, left.normalized(db));
debug_assert_eq!(*right, right.normalized(db));
left.cmp(right)
}
(Type::Tuple(left), Type::Tuple(right)) => left.cmp(right),
(Type::Tuple(_), _) => Ordering::Less,
(_, Type::Tuple(_)) => Ordering::Greater,

Expand Down Expand Up @@ -325,13 +328,6 @@ pub(super) fn union_or_intersection_elements_ordering<'db>(
}

(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.
let left_positive = left.positive(db);
let right_positive = right.positive(db);
Expand All @@ -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")
}
}
}
Expand Down
Loading