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

Revert "experiment: sort all union" 

This reverts commit 7c89918f7f.
This commit is contained in:
Shunsuke Shibayama 2025-12-12 15:18:35 +09:00
parent ab2335dae5
commit b575dcd6b8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ty_python_semantic/src/types/builder.rs
View File

@ -629,7 +629,13 @@ impl<'db> UnionBuilder<'db> {
self.try_build().unwrap_or(Type::Never) self.try_build().unwrap_or(Type::Never)
} }
pub(crate) fn try_build(self) -> Option<Type<'db>> { pub(crate) fn try_build(mut self) -> Option<Type<'db>> {
// If the type is defined recursively, the union type is sorted and normalized.
// This is because the execution order of the queries is not deterministic and may result in a different order of elements.
// The order of the union type does not affect the type check result, but unstable output is undesirable.
if self.recursively_defined.is_yes() {
self.order_elements = true;
}
let mut types = vec![]; let mut types = vec![];
for element in self.elements { for element in self.elements {
match element { match element {
@ -653,8 +659,6 @@ impl<'db> UnionBuilder<'db> {
union_or_intersection_elements_ordering(self.db, l, r) union_or_intersection_elements_ordering(self.db, l, r)
} }
}); });
} else {
types.sort_unstable_by(|l, r| structural_type_ordering(self.db, l, r));
} }
match types.len() { match types.len() {
0 => None, 0 => None,