language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-27 18:36:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[ty] Fix panic on recursive class definitions in a stub that use constrained type variables (#20955)

Browse source
This commit is contained in:
Alex Waygood 2025-10-18 14:02:55 +01:00 • committed by GitHub
parent 7532155c9b
commit 16efe53a72
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ty_python_semantic/src/types.rs
View file

@ -8303,7 +8303,11 @@ impl<'db> TypeVarInstance<'db> {
))
}
#[salsa::tracked(cycle_fn=lazy_bound_cycle_recover, cycle_initial=lazy_bound_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
#[salsa::tracked(
cycle_fn=lazy_bound_or_constraints_cycle_recover,
cycle_initial=lazy_bound_or_constraints_cycle_initial,
heap_size=ruff_memory_usage::heap_size
)]
fn lazy_bound(self, db: &'db dyn Db) -> Option<TypeVarBoundOrConstraints<'db>> {
let definition = self.definition(db)?;
let module = parsed_module(db, definition.file(db)).load(db);
@ -8324,7 +8328,11 @@ impl<'db> TypeVarInstance<'db> {
Some(TypeVarBoundOrConstraints::UpperBound(ty))
}
#[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
#[salsa::tracked(
cycle_fn=lazy_bound_or_constraints_cycle_recover,
cycle_initial=lazy_bound_or_constraints_cycle_initial,
heap_size=ruff_memory_usage::heap_size
)]
fn lazy_constraints(self, db: &'db dyn Db) -> Option<TypeVarBoundOrConstraints<'db>> {
let definition = self.definition(db)?;
let module = parsed_module(db, definition.file(db)).load(db);
@ -8385,7 +8393,7 @@ impl<'db> TypeVarInstance<'db> {
}
#[allow(clippy::ref_option)]
fn lazy_bound_cycle_recover<'db>(
fn lazy_bound_or_constraints_cycle_recover<'db>(
_db: &'db dyn Db,
_value: &Option<TypeVarBoundOrConstraints<'db>>,
_count: u32,
@ -8394,7 +8402,7 @@ fn lazy_bound_cycle_recover<'db>(
salsa::CycleRecoveryAction::Iterate
}
fn lazy_bound_cycle_initial<'db>(
fn lazy_bound_or_constraints_cycle_initial<'db>(
_db: &'db dyn Db,
_self: TypeVarInstance<'db>,
) -> Option<TypeVarBoundOrConstraints<'db>> {