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

gah only inferable

This commit is contained in:
Douglas Creager 2025-11-23 17:14:01 -05:00
parent 34e486f777
commit 3a288ac814
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1093,7 +1093,8 @@ impl<'db> Node<'db> {
// typevar depends on, and existentially abstract them away. // typevar depends on, and existentially abstract them away.
let inferable_dependencies = interior let inferable_dependencies = interior
.sequent_map(db) .sequent_map(db)
.get_typevar_dependencies(typevar.identity(db)); .get_typevar_dependencies(typevar.identity(db))
.filter(|dependency| dependency.is_inferable(db, inferable));
let restricted = self.exists(db, inferable_dependencies); let restricted = self.exists(db, inferable_dependencies);
// Complicating things, the typevar might have gradual constraints. For those, we // Complicating things, the typevar might have gradual constraints. For those, we

23
crates/ty_python_semantic/src/types/generics.rs
View File

@ -128,7 +128,7 @@ pub(crate) enum InferableTypeVars<'a, 'db> {
), ),
} }
impl<'db> BoundTypeVarInstance<'db> { impl<'db> BoundTypeVarIdentity<'db> {
pub(crate) fn is_inferable( pub(crate) fn is_inferable(
self, self,
db: &'db dyn Db, db: &'db dyn Db,
@ -136,12 +136,22 @@ impl<'db> BoundTypeVarInstance<'db> {
) -> bool { ) -> bool {
match inferable { match inferable {
InferableTypeVars::None => false, InferableTypeVars::None => false,
InferableTypeVars::One(typevars) => typevars.contains(&self.identity(db)), InferableTypeVars::One(typevars) => typevars.contains(&self),
InferableTypeVars::Two(left, right) => { InferableTypeVars::Two(left, right) => {
self.is_inferable(db, *left) || self.is_inferable(db, *right) self.is_inferable(db, *left) || self.is_inferable(db, *right)
} }
} }
} }
}
impl<'db> BoundTypeVarInstance<'db> {
pub(crate) fn is_inferable(
self,
db: &'db dyn Db,
inferable: InferableTypeVars<'_, 'db>,
) -> bool {
self.identity(db).is_inferable(db, inferable)
}
/// Returns `true` if all bounds or constraints on this typevar are fully static. /// Returns `true` if all bounds or constraints on this typevar are fully static.
/// ///
@ -153,12 +163,11 @@ impl<'db> BoundTypeVarInstance<'db> {
Some(TypeVarBoundOrConstraints::UpperBound(bound)) => { Some(TypeVarBoundOrConstraints::UpperBound(bound)) => {
bound.top_materialization(db) == bound.bottom_materialization(db) bound.top_materialization(db) == bound.bottom_materialization(db)
} }
Some(TypeVarBoundOrConstraints::Constraints(constraints)) => constraints Some(TypeVarBoundOrConstraints::Constraints(constraints)) => {
.elements(db) constraints.elements(db).iter().all(|constraint| {
.iter()
.all(|constraint| {
constraint.top_materialization(db) == constraint.bottom_materialization(db) constraint.top_materialization(db) == constraint.bottom_materialization(db)
}), })
}
} }
} }
} }