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

cs assignability for paramspecs

This commit is contained in:
Douglas Creager 2025-12-05 15:37:44 -05:00
parent db488e3cf7
commit 056258c767
2 changed files with 63 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ty_python_semantic/resources/mdtest/generics/pep695/paramspec.md
View File

@ -392,15 +392,13 @@ def f3(x: int, y: str) -> int:
return 1
# TODO: This should reveal `(x: int, y: str) -> bool` but there's a cycle: https://github.com/astral-sh/ty/issues/1729
reveal_type(f3) # revealed: ((x: int, y: str) -> bool) | ((x: Divergent, y: Divergent) -> bool)
reveal_type(f3) # revealed: ((x: int, y: str) -> bool) | ((...) -> bool)
reveal_type(f3(1, "a")) # revealed: bool
reveal_type(f3(x=1, y="a")) # revealed: bool
reveal_type(f3(1, y="a")) # revealed: bool
reveal_type(f3(y="a", x=1)) # revealed: bool
# TODO: There should only be one error but the type of `f3` is a union: https://github.com/astral-sh/ty/issues/1729
# error: [missing-argument] "No argument provided for required parameter `y`"
# error: [missing-argument] "No argument provided for required parameter `y`"
f3(1)
# error: [invalid-argument-type] "Argument is incorrect: Expected `int`, found `Literal["a"]`"

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

@ -29,10 +29,10 @@ use crate::types::generics::{
};
use crate::types::infer::nearest_enclosing_class;
use crate::types::{
ApplyTypeMappingVisitor, BindingContext, BoundTypeVarInstance, CallableTypeKind, ClassLiteral,
FindLegacyTypeVarsVisitor, HasRelationToVisitor, IsDisjointVisitor, IsEquivalentVisitor,
KnownClass, MaterializationKind, NormalizedVisitor, ParamSpecAttrKind, TypeContext,
TypeMapping, TypeRelation, VarianceInferable, todo_type,
ApplyTypeMappingVisitor, BindingContext, BoundTypeVarInstance, CallableType, CallableTypeKind,
ClassLiteral, FindLegacyTypeVarsVisitor, HasRelationToVisitor, IsDisjointVisitor,
IsEquivalentVisitor, KnownClass, MaterializationKind, NormalizedVisitor, ParamSpecAttrKind,
TypeContext, TypeMapping, TypeRelation, VarianceInferable, todo_type,
};
use crate::{Db, FxOrderSet};
use ruff_python_ast::{self as ast, name::Name};
@ -1145,6 +1145,57 @@ impl<'db> Signature<'db> {
return result;
}
// If either parameter list is a ParamSpec, then we can create a constraint set that holds
// when the ParamSpec is assignable to the other parameter list.
if relation.is_constraint_set_assignability() {
match (
self.parameters.as_paramspec(),
other.parameters.as_paramspec(),
) {
(Some(self_bound_typevar), Some(other_bound_typevar)) => {
return ConstraintSet::constrain_typevar(
db,
self_bound_typevar,
Type::TypeVar(other_bound_typevar),
Type::TypeVar(other_bound_typevar),
relation,
);
}
(Some(self_bound_typevar), None) => {
let upper = Type::Callable(CallableType::new(
db,
CallableSignature::single(Signature::new(other.parameters.clone(), None)),
CallableTypeKind::ParamSpecValue,
));
return ConstraintSet::constrain_typevar(
db,
self_bound_typevar,
Type::Never,
upper,
relation,
);
}
(None, Some(other_bound_typevar)) => {
let lower = Type::Callable(CallableType::new(
db,
CallableSignature::single(Signature::new(self.parameters.clone(), None)),
CallableTypeKind::ParamSpecValue,
));
return ConstraintSet::constrain_typevar(
db,
other_bound_typevar,
lower,
Type::object(),
relation,
);
}
(None, None) => {}
}
}
let mut parameters = ParametersZip {
current_self: None,
current_other: None,
@ -1562,6 +1613,13 @@ impl<'db> Parameters<'db> {
matches!(self.kind, ParametersKind::Gradual)
}
pub(crate) const fn as_paramspec(&self) -> Option<BoundTypeVarInstance<'db>> {
match self.kind {
ParametersKind::ParamSpec(bound_typevar) => Some(bound_typevar),
_ => None,
}
}
/// Return todo parameters: (*args: Todo, **kwargs: Todo)
pub(crate) fn todo() -> Self {
Self {