Update code to use topsort2

Author: JukkaL

mypy/build.py

@@ -94,7 +94,7 @@
     ErrorTupleRaw,
     report_internal_error,
 )
-from mypy.graph_utils import prepare_sccs, strongly_connected_components, topsort
+from mypy.graph_utils import prepare_sccs, strongly_connected_components, topsort2
 from mypy.indirection import TypeIndirectionVisitor
 from mypy.ipc import BadStatus, IPCClient, IPCMessage, read_status, ready_to_read, receive, send
 from mypy.messages import MessageBuilder
@@ -4236,7 +4236,7 @@ def sorted_components(graph: Graph) -> list[SCC]:
     scc_dep_map = prepare_sccs_full(strongly_connected_components(vertices, edges), edges)
     # Topsort.
     res = []
-    for ready in topsort(scc_dep_map):
+    for ready in topsort2(scc_dep_map):
         # Sort the sets in ready by reversed smallest State.order.  Examples:
         #
         # - If ready is [{x}, {y}], x.order == 1, y.order == 2, we get
@@ -4271,7 +4271,7 @@ def sorted_components_inner(
     edges = {id: deps_filtered(graph, vertices, id, pri_max) for id in vertices}
     sccs = list(strongly_connected_components(vertices, edges))
     res = []
-    for ready in topsort(prepare_sccs(sccs, edges)):
+    for ready in topsort2(prepare_sccs(sccs, edges)):
         res.extend(sorted(ready, key=lambda scc: -min(graph[id].order for id in scc)))
     return res
 

mypy/graph_utils.py

@@ -117,7 +117,7 @@ def topsort(data: dict[T, set[T]]) -> Iterable[set[T]]:
     assert not data, f"A cyclic dependency exists amongst {data!r}"
 
 
-class topsort2(Iterator[set[T]]):
+class topsort2(Iterator[set[T]]):  # noqa: N801
     """Topological sort using Kahn's algorithm.
 
     This is functionally equivalent to topsort() but avoids rebuilding

mypy/solve.py

@@ -8,7 +8,7 @@
 
 from mypy.constraints import SUBTYPE_OF, SUPERTYPE_OF, Constraint, infer_constraints, neg_op
 from mypy.expandtype import expand_type
-from mypy.graph_utils import prepare_sccs, strongly_connected_components, topsort
+from mypy.graph_utils import prepare_sccs, strongly_connected_components, topsort2
 from mypy.join import join_type_list
 from mypy.meet import meet_type_list, meet_types
 from mypy.subtypes import is_subtype
@@ -147,7 +147,7 @@ def solve_with_dependent(
     sccs = list(strongly_connected_components(set(vars), dmap))
     if not all(check_linear(scc, lowers, uppers) for scc in sccs):
         return {}, []
-    raw_batches = list(topsort(prepare_sccs(sccs, dmap)))
+    raw_batches = list(topsort2(prepare_sccs(sccs, dmap)))
 
     free_vars = []
     free_solutions = {}