revert renamings of KnownFunction variants

Author: AlexWaygood

crates/red_knot_python_semantic/src/types.rs

@@ -4045,9 +4045,11 @@ impl<'db> FunctionType<'db> {
 #[cfg_attr(test, derive(strum_macros::EnumIter, strum_macros::IntoStaticStr))]
 pub enum KnownFunction {
     /// `builtins.isinstance`
-    Isinstance,
+    #[strum(serialize = "isinstance")]
+    IsInstance,
     /// `builtins.issubclass`
-    Issubclass,
+    #[strum(serialize = "issubclass")]
+    IsSubclass,
     /// `builtins.reveal_type`, `typing.reveal_type` or `typing_extensions.reveal_type`
     RevealType,
     /// `builtins.len`
@@ -4093,8 +4095,8 @@ pub enum KnownFunction {
 impl KnownFunction {
     pub fn into_constraint_function(self) -> Option<KnownConstraintFunction> {
         match self {
-            Self::Isinstance => Some(KnownConstraintFunction::Isinstance),
-            Self::Issubclass => Some(KnownConstraintFunction::Issubclass),
+            Self::IsInstance => Some(KnownConstraintFunction::IsInstance),
+            Self::IsSubclass => Some(KnownConstraintFunction::IsSubclass),
             _ => None,
         }
     }
@@ -4113,7 +4115,7 @@ impl KnownFunction {
     /// Return `true` if `self` is defined in `module` at runtime.
     const fn check_module(self, module: KnownModule) -> bool {
         match self {
-            Self::Isinstance | Self::Issubclass | Self::Len | Self::Repr => module.is_builtins(),
+            Self::IsInstance | Self::IsSubclass | Self::Len | Self::Repr => module.is_builtins(),
             Self::AssertType
             | Self::Cast
             | Self::Overload
@@ -4151,8 +4153,8 @@ impl KnownFunction {
             Self::AssertType => ParameterExpectations::ValueExpressionAndTypeExpression,
             Self::Cast => ParameterExpectations::TypeExpressionAndValueExpression,
 
-            Self::Isinstance
-            | Self::Issubclass
+            Self::IsInstance
+            | Self::IsSubclass
             | Self::Len
             | Self::Repr
             | Self::Overload
@@ -5653,8 +5655,8 @@ pub(crate) mod tests {
             let module = match function {
                 KnownFunction::Len
                 | KnownFunction::Repr
-                | KnownFunction::Isinstance
-                | KnownFunction::Issubclass => KnownModule::Builtins,
+                | KnownFunction::IsInstance
+                | KnownFunction::IsSubclass => KnownModule::Builtins,
 
                 KnownFunction::GetattrStatic => KnownModule::Inspect,
 

crates/red_knot_python_semantic/src/types/narrow.rs

@@ -87,9 +87,9 @@ fn all_negative_narrowing_constraints_for_expression<'db>(
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum KnownConstraintFunction {
     /// `builtins.isinstance`
-    Isinstance,
+    IsInstance,
     /// `builtins.issubclass`
-    Issubclass,
+    IsSubclass,
 }
 
 impl KnownConstraintFunction {
@@ -99,8 +99,8 @@ impl KnownConstraintFunction {
     /// union types are not yet supported. Returns `None` if the `classinfo` argument has a wrong type.
     fn generate_constraint<'db>(self, db: &'db dyn Db, classinfo: Type<'db>) -> Option<Type<'db>> {
         let constraint_fn = |class| match self {
-            KnownConstraintFunction::Isinstance => Type::instance(class),
-            KnownConstraintFunction::Issubclass => SubclassOfType::from(db, class),
+            KnownConstraintFunction::IsInstance => Type::instance(class),
+            KnownConstraintFunction::IsSubclass => SubclassOfType::from(db, class),
         };
 
         match classinfo {