cache is_redundant_with, not is_subtype_of

Author: AlexWaygood

crates/ty_python_semantic/src/types.rs

@@ -1509,7 +1509,6 @@ impl<'db> Type<'db> {
     /// Return true if this type is a subtype of type `target`.
     ///
     /// See [`TypeRelation::Subtyping`] for more details.
-    #[salsa::tracked(cycle_fn=is_subtype_of_cycle_recover, cycle_initial=is_subtype_of_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(crate) fn is_subtype_of(self, db: &'db dyn Db, target: Type<'db>) -> bool {
         self.when_subtype_of(db, target, InferableTypeVars::None)
             .is_always_satisfied()
@@ -1544,6 +1543,7 @@ impl<'db> Type<'db> {
     /// Return `true` if it would be redundant to add `self` to a union that already contains `other`.
     ///
     /// See [`TypeRelation::Redundancy`] for more details.
+    #[salsa::tracked(cycle_fn=is_redundant_with_cycle_recover, cycle_initial=is_redundant_with_cycle_initial, heap_size=ruff_memory_usage::heap_size)]
     pub(crate) fn is_redundant_with(self, db: &'db dyn Db, other: Type<'db>) -> bool {
         self.has_relation_to(db, other, InferableTypeVars::None, TypeRelation::Redundancy)
             .is_always_satisfied()
@@ -7328,7 +7328,7 @@ impl<'db> VarianceInferable<'db> for Type<'db> {
 }
 
 #[allow(clippy::trivially_copy_pass_by_ref)]
-fn is_subtype_of_cycle_recover<'db>(
+fn is_redundant_with_cycle_recover<'db>(
     _db: &'db dyn Db,
     _value: &bool,
     _count: u32,
@@ -7338,7 +7338,7 @@ fn is_subtype_of_cycle_recover<'db>(
     salsa::CycleRecoveryAction::Iterate
 }
 
-fn is_subtype_of_cycle_initial<'db>(
+fn is_redundant_with_cycle_initial<'db>(
     _db: &'db dyn Db,
     _subtype: Type<'db>,
     _supertype: Type<'db>,