mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 13:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

use smallest individual constraint

Browse source
This commit is contained in:
Douglas Creager 2025-09-02 14:36:43 -04:00
parent 7abff51010
commit 0bca607ab6
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ty_python_semantic/src/types/generics.rs
View file

@ -19,7 +19,7 @@ use crate::types::{
ApplyTypeMappingVisitor, BoundTypeVarInstance, FindLegacyTypeVarsVisitor, HasRelationToVisitor, ApplyTypeMappingVisitor, BoundTypeVarInstance, FindLegacyTypeVarsVisitor, HasRelationToVisitor,
IsEquivalentVisitor, KnownClass, KnownInstanceType, MaterializationKind, NormalizedVisitor, IsEquivalentVisitor, KnownClass, KnownInstanceType, MaterializationKind, NormalizedVisitor,
Type, TypeMapping, TypeRelation, TypeVarBoundOrConstraints, TypeVarInstance, TypeVarKind, Type, TypeMapping, TypeRelation, TypeVarBoundOrConstraints, TypeVarInstance, TypeVarKind,
TypeVarVariance, UnionBuilder, UnionType, binding_type, declaration_type, TypeVarVariance, UnionType, binding_type, declaration_type,
}; };
use crate::{Db, FxOrderSet}; use crate::{Db, FxOrderSet};
@ -1114,26 +1114,30 @@ impl<'db> SpecializationBuilder<'db> {
Some(TypeVarBoundOrConstraints::Constraints(constraints)) => { Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
// If the type is assignable to _all_ of the constraints, then we // If the type is assignable to _all_ of the constraints, then we
// specialize the typevar to the type itself. If the type is assignable to // specialize the typevar to the type itself. If the type is assignable to
// some but not all of them, we specialize the type to the union of the // some but not all of them, we specialize the typevar to the "smallest"
// constraints that it was assignable to. Otherwise it's a specialization // constraint that the type is assignable to. Otherwise it's a
// error. // specialization error.
let mut builder = UnionBuilder::new(self.db);
let mut when_all_assignable = ConstraintSet::from(true); let mut when_all_assignable = ConstraintSet::from(true);
let mut any_assignable = false; let mut smallest_assignable = None;
for constraint in constraints.elements(self.db) { for constraint in constraints.elements(self.db) {
let when_assignable: ConstraintSet = let when_assignable: ConstraintSet =
ty.when_assignable_to(self.db, *constraint); ty.when_assignable_to(self.db, *constraint);
if when_assignable.is_always_satisfied() { if when_assignable.is_always_satisfied() {
builder = builder.add(*constraint); // If the type is assignable to this constraint individually. We
any_assignable = true; // only track the smallest such constraint.
if let Some(existing) = smallest_assignable.replace(*constraint) {
if existing.is_assignable_to(self.db, *constraint) {
smallest_assignable.replace(existing);
}
}
} }
when_all_assignable.intersect(self.db, &when_assignable); when_all_assignable.intersect(self.db, &when_assignable);
} }
if when_all_assignable.is_always_satisfied() { if when_all_assignable.is_always_satisfied() {
self.add_type_mapping(bound_typevar, ty); self.add_type_mapping(bound_typevar, ty);
} else if any_assignable { } else if let Some(smallest_assignable) = smallest_assignable {
self.add_type_mapping(bound_typevar, builder.build()); self.add_type_mapping(bound_typevar, smallest_assignable);
} else { } else {
return Err(SpecializationError::MismatchedConstraint { return Err(SpecializationError::MismatchedConstraint {
bound_typevar, bound_typevar,