Remove unrelated changes

Author: cdce8p

mypy/expandtype.py

@@ -526,7 +526,10 @@ def visit_type_alias_type(self, t: TypeAliasType) -> Type:
         return t.copy_modified(args=self.expand_types(t.args))
 
     def expand_types(self, types: Iterable[Type]) -> list[Type]:
-        return [t.accept(self) for t in types]
+        a: list[Type] = []
+        for t in types:
+            a.append(t.accept(self))
+        return a
 
     def visit_type_list(self, t: TypeList) -> Type:
         return t

mypy/server/update.py

@@ -161,7 +161,6 @@
 from mypy.server.deps import get_dependencies_of_target, merge_dependencies
 from mypy.server.target import trigger_to_target
 from mypy.server.trigger import WILDCARD_TAG, make_trigger
-from mypy.typeanal import remove_dups
 from mypy.typestate import type_state
 from mypy.util import module_prefix, split_target
 
@@ -245,7 +244,7 @@ def update(
 
         self.triggered = []
         self.updated_modules = []
-        changed_modules = remove_dups(changed_modules + self.stale)
+        changed_modules = dedupe_modules(changed_modules + self.stale)
         initial_set = {id for id, _ in changed_modules}
         self.manager.log_fine_grained(
             "==== update %s ====" % ", ".join(repr(id) for id, _ in changed_modules)
@@ -260,7 +259,7 @@ def update(
             # Handle blocking errors first. We'll exit as soon as we find a
             # module that still has blocking errors.
             self.manager.log_fine_grained(f"existing blocker: {self.blocking_error[0]}")
-            changed_modules = remove_dups([self.blocking_error] + changed_modules)
+            changed_modules = dedupe_modules([self.blocking_error] + changed_modules)
             blocking_error = self.blocking_error[0]
             self.blocking_error = None
 
@@ -295,7 +294,7 @@ def update(
                     self.previous_targets_with_errors,
                     self.processed_targets,
                 )
-                changed_modules = remove_dups(changed_modules)
+                changed_modules = dedupe_modules(changed_modules)
                 if not changed_modules:
                     # Preserve state needed for the next update.
                     self.previous_targets_with_errors = self.manager.errors.targets()
@@ -370,7 +369,7 @@ def update_one(
         result = self.update_module(next_id, next_path, next_id in removed_set, followed)
         remaining, (next_id, next_path), blocker_messages = result
         changed_modules = [(id, path) for id, path in changed_modules if id != next_id]
-        changed_modules = remove_dups(remaining + changed_modules)
+        changed_modules = dedupe_modules(remaining + changed_modules)
         t1 = time.time()
 
         self.manager.log_fine_grained(
@@ -727,6 +726,16 @@ def delete_module(module_id: str, path: str, graph: Graph, manager: BuildManager
         manager.missing_modules.add(module_id)
 
 
+def dedupe_modules(modules: list[tuple[str, str]]) -> list[tuple[str, str]]:
+    seen: set[str] = set()
+    result = []
+    for id, path in modules:
+        if id not in seen:
+            seen.add(id)
+            result.append((id, path))
+    return result
+
+
 def get_module_to_path_map(graph: Graph) -> dict[str, str]:
     return {module: node.xpath for module, node in graph.items()}
 

mypy/suggestions.py

@@ -278,7 +278,7 @@ def suggest_callsites(self, function: str) -> str:
             callsites, _ = self.get_callsites(node)
 
         return "\n".join(
-            dict.fromkeys(
+            dedup(
                 [
                     f"{path}:{line}: {self.format_args(arg_kinds, arg_names, arg_types)}"
                     for path, line, arg_kinds, _, arg_names, arg_types in callsites

mypy/typeanal.py

@@ -1828,7 +1828,13 @@ def remove_dups(tvars: list[T]) -> list[T]:
     if len(tvars) <= 1:
         return tvars
     # Get unique elements in order of appearance
-    return list(dict.fromkeys(tvars))
+    all_tvars: set[T] = set()
+    new_tvars: list[T] = []
+    for t in tvars:
+        if t not in all_tvars:
+            new_tvars.append(t)
+            all_tvars.add(t)
+    return new_tvars
 
 
 def flatten_tvars(lists: list[list[T]]) -> list[T]: