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

document

This commit is contained in:
Douglas Creager 2025-11-11 17:17:34 -05:00
parent a012e28216
commit dedfa8a642
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ty_python_semantic/src/types/constraints.rs
View File

@ -294,7 +294,12 @@ impl<'db> ConstraintSet<'db> {
}
/// Updates this constraint set to hold the union of itself and another constraint set.
/// XXX: Document not commutative
///
/// Because constraint sets track the set of inferable typevars, this operation is not
/// commutative! We keep the inferable set of the lhs. If the rhs has inferable typevars that
/// are not inferable in the lhs, those will be existentially quantified away. The result will
/// only mention typevars that are inferable in the lhs, or which both sides consider
/// non-inferable.
pub(crate) fn union(&mut self, db: &'db dyn Db, other: Self) -> Self {
let other = other.reduce_inferable(db, self.inferable);
self.node = self.node.or(db, other.node);
@ -302,7 +307,12 @@ impl<'db> ConstraintSet<'db> {
}
/// Updates this constraint set to hold the intersection of itself and another constraint set.
/// XXX: Document not commutative
///
/// Because constraint sets track the set of inferable typevars, this operation is not
/// commutative! We keep the inferable set of the lhs. If the rhs has inferable typevars that
/// are not inferable in the lhs, those will be existentially quantified away. The result will
/// only mention typevars that are inferable in the lhs, or which both sides consider
/// non-inferable.
pub(crate) fn intersect(&mut self, db: &'db dyn Db, other: Self) -> Self {
let other = other.reduce_inferable(db, self.inferable);
self.node = self.node.and(db, other.node);

30
crates/ty_python_semantic/src/types/signatures.rs
View File

@ -651,22 +651,6 @@ impl<'db> Signature<'db> {
inferable: InferableTypeVars<'db>,
visitor: &IsEquivalentVisitor<'db>,
) -> ConstraintSet<'db> {
self.is_equivalent_to_inner(db, other, inferable, visitor)
.reduce_inferable(db, inferable)
}
fn is_equivalent_to_inner(
&self,
db: &'db dyn Db,
other: &Signature<'db>,
inferable: InferableTypeVars<'db>,
visitor: &IsEquivalentVisitor<'db>,
) -> ConstraintSet<'db> {
// The typevars in self and other should also be considered inferable when checking whether
// two signatures are equivalent.
let inferable = inferable.merge(db, self.inferable_typevars(db));
let inferable = inferable.merge(db, other.inferable_typevars(db));
let mut result = ConstraintSet::always(inferable);
let mut check_types = |self_type: Option<Type<'db>>, other_type: Option<Type<'db>>| {
let self_type = self_type.unwrap_or(Type::unknown());
@ -756,15 +740,23 @@ impl<'db> Signature<'db> {
relation_visitor: &HasRelationToVisitor<'db>,
disjointness_visitor: &IsDisjointVisitor<'db>,
) -> ConstraintSet<'db> {
self.has_relation_to_inner(
// If this callable is generic, then `inner` will add all of our typevars to the
// `inferable` set, since we only need to find one specialization that causes the check to
// succeed.
let when = self.has_relation_to_inner(
db,
other,
inferable,
relation,
relation_visitor,
disjointness_visitor,
)
.reduce_inferable(db, inferable)
);
// But the caller does not need to consider those extra typevars. Whatever constraint set
// we produce, we reduce it back down to the inferable set that the caller asked about.
// If we introduced new inferable typevars, those will be existentially quantified away
// before returning.
when.reduce_inferable(db, inferable)
}
fn has_relation_to_inner(