remove unused DynamicType variant

Author: AlexWaygood

crates/ty_python_semantic/src/types.rs

@@ -589,7 +589,7 @@ impl<'db> Type<'db> {
 
     pub fn contains_todo(&self, db: &'db dyn Db) -> bool {
         match self {
-            Self::Dynamic(DynamicType::Todo(_) | DynamicType::SubscriptedProtocol) => true,
+            Self::Dynamic(DynamicType::Todo(_)) => true,
 
             Self::AlwaysFalsy
             | Self::AlwaysTruthy
@@ -630,9 +630,7 @@ impl<'db> Type<'db> {
             }
 
             Self::SubclassOf(subclass_of) => match subclass_of.subclass_of() {
-                SubclassOfInner::Dynamic(
-                    DynamicType::Todo(_) | DynamicType::SubscriptedProtocol,
-                ) => true,
+                SubclassOfInner::Dynamic(DynamicType::Todo(_)) => true,
                 SubclassOfInner::Dynamic(DynamicType::Unknown | DynamicType::Any) => false,
                 SubclassOfInner::Class(_) => false,
             },
@@ -649,12 +647,10 @@ impl<'db> Type<'db> {
             Self::BoundSuper(bound_super) => {
                 matches!(
                     bound_super.pivot_class(db),
-                    ClassBase::Dynamic(DynamicType::Todo(_) | DynamicType::SubscriptedProtocol)
+                    ClassBase::Dynamic(DynamicType::Todo(_))
                 ) || matches!(
                     bound_super.owner(db),
-                    SuperOwnerKind::Dynamic(
-                        DynamicType::Todo(_) | DynamicType::SubscriptedProtocol
-                    )
+                    SuperOwnerKind::Dynamic(DynamicType::Todo(_))
                 )
             }
 
@@ -5437,9 +5433,6 @@ pub enum DynamicType {
     ///
     /// This variant should be created with the `todo_type!` macro.
     Todo(TodoType),
-    /// Temporary type until we support generic protocols.
-    /// We use a separate variant (instead of `Todo(…)`) in order to be able to match on them explicitly.
-    SubscriptedProtocol,
 }
 
 impl std::fmt::Display for DynamicType {
@@ -5450,11 +5443,6 @@ impl std::fmt::Display for DynamicType {
             // `DynamicType::Todo`'s display should be explicit that is not a valid display of
             // any other type
             DynamicType::Todo(todo) => write!(f, "@Todo{todo}"),
-            DynamicType::SubscriptedProtocol => f.write_str(if cfg!(debug_assertions) {
-                "@Todo(`Protocol[]` subscript)"
-            } else {
-                "@Todo"
-            }),
         }
     }
 }

crates/ty_python_semantic/src/types/class_base.rs

@@ -77,9 +77,7 @@ impl<'db> ClassBase<'db> {
             ClassBase::Dynamic(DynamicType::Any) => "Any",
             ClassBase::Dynamic(DynamicType::Unknown) => "Unknown",
             ClassBase::Dynamic(DynamicType::Todo(_)) => "@Todo",
-            ClassBase::Protocol(_) | ClassBase::Dynamic(DynamicType::SubscriptedProtocol) => {
-                "Protocol"
-            }
+            ClassBase::Protocol(_) => "Protocol",
             ClassBase::Generic(_) => "Generic",
         }
     }
@@ -264,9 +262,6 @@ impl<'db> ClassBase<'db> {
             ClassBase::Protocol(context) => {
                 ClassBaseMroIterator::length_3(db, self, ClassBase::Generic(context))
             }
-            ClassBase::Dynamic(DynamicType::SubscriptedProtocol) => {
-                ClassBaseMroIterator::length_3(db, self, ClassBase::Generic(None))
-            }
             ClassBase::Dynamic(_) | ClassBase::Generic(_) => {
                 ClassBaseMroIterator::length_2(db, self)
             }

crates/ty_python_semantic/src/types/infer.rs

@@ -5797,8 +5797,6 @@ impl<'db> TypeInferenceBuilder<'db> {
             | (_, unknown @ Type::Dynamic(DynamicType::Unknown), _) => Some(unknown),
             (todo @ Type::Dynamic(DynamicType::Todo(_)), _, _)
             | (_, todo @ Type::Dynamic(DynamicType::Todo(_)), _) => Some(todo),
-            (todo @ Type::Dynamic(DynamicType::SubscriptedProtocol), _, _)
-            | (_, todo @ Type::Dynamic(DynamicType::SubscriptedProtocol), _) => Some(todo),
             (Type::Never, _, _) | (_, Type::Never, _) => Some(Type::Never),
 
             (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Add) => Some(

crates/ty_python_semantic/src/types/mro.rs

@@ -174,7 +174,9 @@ impl<'db> Mro<'db> {
                             continue;
                         }
                         match base {
-                            ClassBase::Class(_) | ClassBase::Generic(_) | ClassBase::Protocol(_) => {
+                            ClassBase::Class(_)
+                            | ClassBase::Generic(_)
+                            | ClassBase::Protocol(_) => {
                                 errors.push(DuplicateBaseError {
                                     duplicate_base: base,
                                     first_index: *first_index,

crates/ty_python_semantic/src/types/type_ordering.rs

@@ -386,8 +386,5 @@ fn dynamic_elements_ordering(left: DynamicType, right: DynamicType) -> Ordering
 
         #[cfg(not(debug_assertions))]
         (DynamicType::Todo(TodoType), DynamicType::Todo(TodoType)) => Ordering::Equal,
-
-        (DynamicType::SubscriptedProtocol, _) => Ordering::Less,
-        (_, DynamicType::SubscriptedProtocol) => Ordering::Greater,
     }
 }