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

add `TypedDictType::structural_ordering`

This commit is contained in:
Shunsuke Shibayama 2025-12-12 13:07:36 +09:00
parent a1ca369566
commit 6b7f5d42d2
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ty_python_semantic/src/types/type_ordering.rs
View File

@ -207,9 +207,7 @@ pub(super) fn structural_type_ordering<'db>(
(Type::TypeAlias(_), _) => Ordering::Less,
(_, Type::TypeAlias(_)) => Ordering::Greater,
(Type::TypedDict(left), Type::TypedDict(right)) => left
.defining_class()
.structural_ordering(db, right.defining_class()),
(Type::TypedDict(left), Type::TypedDict(right)) => left.structural_ordering(db, *right),
(Type::TypedDict(_), _) => Ordering::Less,
(_, Type::TypedDict(_)) => Ordering::Greater,

52
crates/ty_python_semantic/src/types/typed_dict.rs
View File

@ -22,7 +22,7 @@ use crate::types::constraints::{ConstraintSet, IteratorConstraintsExtension};
use crate::types::generics::InferableTypeVars;
use crate::types::{
HasRelationToVisitor, IsDisjointVisitor, IsEquivalentVisitor, NormalizedVisitor, TypeContext,
TypeRelation,
TypeRelation, structural_type_ordering,
};
use ordermap::OrderSet;
@ -341,6 +341,56 @@ impl<'db> TypedDictType<'db> {
},
)
}
pub(super) fn structural_ordering(
self,
db: &'db dyn Db,
other: TypedDictType<'db>,
) -> std::cmp::Ordering {
match (self, other) {
(TypedDictType::Class(self_class), TypedDictType::Class(other_class)) => {
self_class.structural_ordering(db, other_class)
}
(TypedDictType::Synthesized(self_dict), TypedDictType::Synthesized(other_dict)) => {
let self_items = self_dict.items(db);
let other_items = other_dict.items(db);
// Compare number of items first
let items_count = self_items.len().cmp(&other_items.len());
if items_count != std::cmp::Ordering::Equal {
return items_count;
}
// Compare each item in order
for ((self_name, self_field), (other_name, other_field)) in
self_items.iter().zip(other_items.iter())
{
let ord = self_name.cmp(other_name);
if ord != std::cmp::Ordering::Equal {
return ord;
}
let ord = structural_type_ordering(
db,
&self_field.declared_ty,
&other_field.declared_ty,
);
if ord != std::cmp::Ordering::Equal {
return ord;
}
let ord = self_field.flags.bits().cmp(&other_field.flags.bits());
if ord != std::cmp::Ordering::Equal {
return ord;
}
}
std::cmp::Ordering::Equal
}
(TypedDictType::Class(_), TypedDictType::Synthesized(_)) => std::cmp::Ordering::Less,
(TypedDictType::Synthesized(_), TypedDictType::Class(_)) => std::cmp::Ordering::Greater,
}
}
}
pub(crate) fn walk_typed_dict_type<'db, V: visitor::TypeVisitor<'db> + ?Sized>(