Minor adjustments

Author: sharkdp

crates/ty_python_semantic/src/types.rs

@@ -6008,7 +6008,7 @@ impl<'db> Type<'db> {
                 TypeMapping::PromoteLiterals |
                 TypeMapping::BindLegacyTypevars(_) |
                 TypeMapping::BindSelf(_) |
-                TypeMapping::ReplaceSelf { new_upper_bound: _ }
+                TypeMapping::ReplaceSelf { .. }
                     => self,
                 TypeMapping::Materialize(materialization_kind)  => Type::NonInferableTypeVar(bound_typevar.materialize_impl(db, *materialization_kind, visitor))
 
@@ -6022,7 +6022,7 @@ impl<'db> Type<'db> {
                 TypeMapping::PartialSpecialization(_) |
                 TypeMapping::PromoteLiterals |
                 TypeMapping::BindSelf(_) |
-                TypeMapping::ReplaceSelf { new_upper_bound: _ } |
+                TypeMapping::ReplaceSelf { .. } |
                 TypeMapping::MarkTypeVarsInferable(_) |
                 TypeMapping::Materialize(_) => self,
             }
@@ -6131,7 +6131,7 @@ impl<'db> Type<'db> {
                 TypeMapping::PartialSpecialization(_) |
                 TypeMapping::BindLegacyTypevars(_) |
                 TypeMapping::BindSelf(_) |
-                TypeMapping::ReplaceSelf { new_upper_bound: _ } |
+                TypeMapping::ReplaceSelf { .. } |
                 TypeMapping::MarkTypeVarsInferable(_) |
                 TypeMapping::Materialize(_) => self,
                 TypeMapping::PromoteLiterals => self.literal_fallback_instance(db)
@@ -6143,7 +6143,7 @@ impl<'db> Type<'db> {
                 TypeMapping::PartialSpecialization(_) |
                 TypeMapping::BindLegacyTypevars(_) |
                 TypeMapping::BindSelf(_) |
-                TypeMapping::ReplaceSelf { new_upper_bound: _ } |
+                TypeMapping::ReplaceSelf { .. } |
                 TypeMapping::MarkTypeVarsInferable(_) |
                 TypeMapping::PromoteLiterals => self,
                 TypeMapping::Materialize(materialization_kind) => match materialization_kind {
@@ -6679,7 +6679,7 @@ pub enum TypeMapping<'a, 'db> {
     BindLegacyTypevars(BindingContext<'db>),
     /// Binds any `typing.Self` typevar with a particular `self` class.
     BindSelf(Type<'db>),
-    /// Replaces occurrences of `typing.Self` with a new `Self` type variable that has the given upper bound.
+    /// Replaces occurrences of `typing.Self` with a new `Self` type variable with the given upper bound.
     ReplaceSelf { new_upper_bound: Type<'db> },
     /// Marks the typevars that are bound by a generic class or function as inferable.
     MarkTypeVarsInferable(BindingContext<'db>),
@@ -6726,10 +6726,8 @@ impl<'db> TypeMapping<'_, 'db> {
                 TypeMapping::BindLegacyTypevars(*binding_context)
             }
             TypeMapping::BindSelf(self_type) => TypeMapping::BindSelf(*self_type),
-            TypeMapping::ReplaceSelf {
-                new_upper_bound: replacement_type,
-            } => TypeMapping::ReplaceSelf {
-                new_upper_bound: *replacement_type,
+            TypeMapping::ReplaceSelf { new_upper_bound } => TypeMapping::ReplaceSelf {
+                new_upper_bound: *new_upper_bound,
             },
             TypeMapping::MarkTypeVarsInferable(binding_context) => {
                 TypeMapping::MarkTypeVarsInferable(*binding_context)
@@ -6755,10 +6753,8 @@ impl<'db> TypeMapping<'_, 'db> {
             TypeMapping::BindSelf(self_type) => {
                 TypeMapping::BindSelf(self_type.normalized_impl(db, visitor))
             }
-            TypeMapping::ReplaceSelf {
-                new_upper_bound: replacement_type,
-            } => TypeMapping::ReplaceSelf {
-                new_upper_bound: replacement_type.normalized_impl(db, visitor),
+            TypeMapping::ReplaceSelf { new_upper_bound } => TypeMapping::ReplaceSelf {
+                new_upper_bound: new_upper_bound.normalized_impl(db, visitor),
             },
             TypeMapping::MarkTypeVarsInferable(binding_context) => {
                 TypeMapping::MarkTypeVarsInferable(*binding_context)
@@ -6781,8 +6777,15 @@ impl<'db> TypeMapping<'_, 'db> {
             | TypeMapping::PromoteLiterals
             | TypeMapping::BindLegacyTypevars(_)
             | TypeMapping::MarkTypeVarsInferable(_)
-            | TypeMapping::Materialize(_)
-            | TypeMapping::BindSelf(_) => context,
+            | TypeMapping::Materialize(_) => context,
+            TypeMapping::BindSelf(_) => GenericContext::from_typevar_instances(
+                db,
+                context
+                    .variables(db)
+                    .iter()
+                    .filter(|var| !var.typevar(db).kind(db).is_self())
+                    .copied(),
+            ),
             TypeMapping::ReplaceSelf { new_upper_bound } => GenericContext::from_typevar_instances(
                 db,
                 context.variables(db).iter().map(|typevar| {
@@ -10923,7 +10926,7 @@ impl<'db> TypeIsType<'db> {
 /// Walk the MRO of this class and return the last class just before the specified known base.
 /// This can be used to determine upper bounds for `Self` type variables on methods that are
 /// being added to the given class.
-pub(super) fn find_upper_bound<'db>(
+pub(super) fn determine_upper_bound<'db>(
     db: &'db dyn Db,
     class_literal: ClassLiteral<'db>,
     specialization: Option<Specialization<'db>>,

crates/ty_python_semantic/src/types/class.rs

@@ -30,7 +30,7 @@ use crate::types::{
     IsEquivalentVisitor, KnownInstanceType, ManualPEP695TypeAliasType, MaterializationKind,
     NormalizedVisitor, PropertyInstanceType, StringLiteralType, TypeAliasType, TypeContext,
     TypeMapping, TypeRelation, TypeVarBoundOrConstraints, TypeVarInstance, TypeVarKind,
-    TypedDictParams, UnionBuilder, VarianceInferable, declaration_type, find_upper_bound,
+    TypedDictParams, UnionBuilder, VarianceInferable, declaration_type, determine_upper_bound,
     infer_definition_types,
 };
 use crate::{
@@ -1985,7 +1985,7 @@ impl<'db> ClassLiteral<'db> {
                             ty.apply_type_mapping(
                                 db,
                                 &TypeMapping::ReplaceSelf {
-                                    new_upper_bound: find_upper_bound(
+                                    new_upper_bound: determine_upper_bound(
                                         db,
                                         self,
                                         None,
@@ -2278,7 +2278,7 @@ impl<'db> ClassLiteral<'db> {
                         ty.apply_type_mapping(
                             db,
                             &TypeMapping::ReplaceSelf {
-                                new_upper_bound: find_upper_bound(
+                                new_upper_bound: determine_upper_bound(
                                     db,
                                     self,
                                     specialization,
@@ -2615,7 +2615,7 @@ impl<'db> ClassLiteral<'db> {
                 .map_type(|ty|
                     ty.apply_type_mapping(
                         db,
-                        &TypeMapping::ReplaceSelf {new_upper_bound: find_upper_bound(db, self, specialization, ClassBase::is_typed_dict) }
+                        &TypeMapping::ReplaceSelf {new_upper_bound: determine_upper_bound(db, self, specialization, ClassBase::is_typed_dict) }
                     )
                 )
         }