From 59dedb5d3c00fb8183653de91f45d49caed70fed Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Thu, 24 Apr 2025 18:39:43 -0700 Subject: [PATCH] [red-knot] remove fixpoint handling from try_mro query --- .../src/types/class.rs | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/crates/red_knot_python_semantic/src/types/class.rs b/crates/red_knot_python_semantic/src/types/class.rs index f74e7d276f..52246ad4f5 100644 --- a/crates/red_knot_python_semantic/src/types/class.rs +++ b/crates/red_knot_python_semantic/src/types/class.rs @@ -62,28 +62,6 @@ fn explicit_bases_cycle_initial<'db>( Box::default() } -fn try_mro_cycle_recover<'db>( - _db: &'db dyn Db, - _value: &Result, MroError<'db>>, - _count: u32, - _self: ClassLiteralType<'db>, - _specialization: Option>, -) -> salsa::CycleRecoveryAction, MroError<'db>>> { - salsa::CycleRecoveryAction::Iterate -} - -#[allow(clippy::unnecessary_wraps)] -fn try_mro_cycle_initial<'db>( - db: &'db dyn Db, - self_: ClassLiteralType<'db>, - specialization: Option>, -) -> Result, MroError<'db>> { - Ok(Mro::from_error( - db, - self_.apply_optional_specialization(db, specialization), - )) -} - #[allow(clippy::ref_option, clippy::trivially_copy_pass_by_ref)] fn inheritance_cycle_recover<'db>( _db: &'db dyn Db, @@ -661,7 +639,7 @@ impl<'db> ClassLiteralType<'db> { /// attribute on a class at runtime. /// /// [method resolution order]: https://docs.python.org/3/glossary.html#term-method-resolution-order - #[salsa::tracked(return_ref, cycle_fn=try_mro_cycle_recover, cycle_initial=try_mro_cycle_initial)] + #[salsa::tracked(return_ref)] pub(super) fn try_mro( self, db: &'db dyn Db,