From 7135a49aea38dbf4d5513ea2704c34f235807559 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Wed, 11 Dec 2024 15:17:56 +0000
Subject: [PATCH] [red-knot] Record the TODO message in `ClassBase::Todo`, same
 as in `Type::Todo` (#14919)

---
 crates/red_knot_python_semantic/src/types.rs     |  2 +-
 crates/red_knot_python_semantic/src/types/mro.rs | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/red_knot_python_semantic/src/types.rs b/crates/red_knot_python_semantic/src/types.rs
index f4e365032b..f18754ce5e 100644
--- a/crates/red_knot_python_semantic/src/types.rs
+++ b/crates/red_knot_python_semantic/src/types.rs
@@ -2711,7 +2711,7 @@ impl<'db> Class<'db> {
             match superclass {
                 // TODO we may instead want to record the fact that we encountered dynamic, and intersect it with
                 // the type found on the next "real" class.
-                ClassBase::Any | ClassBase::Unknown | ClassBase::Todo => {
+                ClassBase::Any | ClassBase::Unknown | ClassBase::Todo(_) => {
                     return Type::from(superclass).member(db, name)
                 }
                 ClassBase::Class(class) => {
diff --git a/crates/red_knot_python_semantic/src/types/mro.rs b/crates/red_knot_python_semantic/src/types/mro.rs
index 0bb97b5da8..9ee5b41113 100644
--- a/crates/red_knot_python_semantic/src/types/mro.rs
+++ b/crates/red_knot_python_semantic/src/types/mro.rs
@@ -4,8 +4,8 @@ use std::ops::Deref;
 use itertools::Either;
 use rustc_hash::FxHashSet;
 
-use super::{Class, ClassLiteralType, KnownClass, KnownInstanceType, Type};
-use crate::{types::todo_type, Db};
+use super::{Class, ClassLiteralType, KnownClass, KnownInstanceType, TodoType, Type};
+use crate::Db;
 
 /// The inferred method resolution order of a given class.
 ///
@@ -296,7 +296,7 @@ pub(super) enum MroErrorKind<'db> {
 pub enum ClassBase<'db> {
     Any,
     Unknown,
-    Todo,
+    Todo(TodoType),
     Class(Class<'db>),
 }
 
@@ -311,7 +311,7 @@ impl<'db> ClassBase<'db> {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
                 match self.base {
                     ClassBase::Any => f.write_str("Any"),
-                    ClassBase::Todo => f.write_str("Todo"),
+                    ClassBase::Todo(todo) => todo.fmt(f),
                     ClassBase::Unknown => f.write_str("Unknown"),
                     ClassBase::Class(class) => write!(f, "<class '{}'>", class.name(self.db)),
                 }
@@ -338,7 +338,7 @@ impl<'db> ClassBase<'db> {
         match ty {
             Type::Any => Some(Self::Any),
             Type::Unknown => Some(Self::Unknown),
-            Type::Todo(_) => Some(Self::Todo),
+            Type::Todo(todo) => Some(Self::Todo(todo)),
             Type::ClassLiteral(ClassLiteralType { class }) => Some(Self::Class(class)),
             Type::Union(_) => None, // TODO -- forces consideration of multiple possible MROs?
             Type::Intersection(_) => None, // TODO -- probably incorrect?
@@ -389,7 +389,9 @@ impl<'db> ClassBase<'db> {
             ClassBase::Unknown => {
                 Either::Left([ClassBase::Unknown, ClassBase::object(db)].into_iter())
             }
-            ClassBase::Todo => Either::Left([ClassBase::Todo, ClassBase::object(db)].into_iter()),
+            ClassBase::Todo(todo) => {
+                Either::Left([ClassBase::Todo(todo), ClassBase::object(db)].into_iter())
+            }
             ClassBase::Class(class) => Either::Right(class.iter_mro(db)),
         }
     }
@@ -405,7 +407,7 @@ impl<'db> From<ClassBase<'db>> for Type<'db> {
     fn from(value: ClassBase<'db>) -> Self {
         match value {
             ClassBase::Any => Type::Any,
-            ClassBase::Todo => todo_type!(),
+            ClassBase::Todo(todo) => Type::Todo(todo),
             ClassBase::Unknown => Type::Unknown,
             ClassBase::Class(class) => Type::class_literal(class),
         }