Clean up

Author: JukkaL

mypyc/build.py

@@ -40,7 +40,6 @@
 from mypyc.common import IS_FREE_THREADED, RUNTIME_C_FILES, shared_lib_name
 from mypyc.errors import Errors
 from mypyc.ir.deps import SourceDep
-from mypyc.ir.module_ir import ModuleIR
 from mypyc.ir.pprint import format_modules
 from mypyc.namegen import exported_name
 from mypyc.options import CompilerOptions
@@ -278,16 +277,6 @@ def include_dir() -> str:
     return os.path.join(os.path.abspath(os.path.dirname(__file__)), "lib-rt")
 
 
-def collect_source_dependencies(modules: dict[str, ModuleIR]) -> set[SourceDep]:
-    """Collect all SourceDep dependencies from all modules."""
-    source_deps: set[SourceDep] = set()
-    for module in modules.values():
-        for dep in module.dependencies:
-            if isinstance(dep, SourceDep):
-                source_deps.add(dep)
-    return source_deps
-
-
 def generate_c(
     sources: list[BuildSource],
     options: Options,
@@ -338,7 +327,7 @@ def generate_c(
         generate_annotated_html(options.mypyc_annotation_file, result, modules, mapper)
 
     # Collect SourceDep dependencies
-    source_deps = sorted(collect_source_dependencies(modules), key=lambda d: d.path)
+    source_deps = sorted(emitmodule.collect_source_dependencies(modules), key=lambda d: d.path)
 
     return ctext, "\n".join(format_modules(modules)), source_deps
 
@@ -736,7 +725,7 @@ def mypycify(
             with open(os.path.join(include_dir(), name), encoding="utf-8") as f:
                 write_file(rt_file, f.read())
             # Only add .c files to shared_cfilenames
-            if name.endswith('.c'):
+            if name.endswith(".c"):
                 shared_cfilenames.append(rt_file)
 
     extensions = []

mypyc/codegen/emitmodule.py

@@ -29,8 +29,13 @@
 from mypy.util import hash_digest, json_dumps
 from mypyc.analysis.capsule_deps import find_implicit_op_dependencies
 from mypyc.codegen.cstring import c_string_initializer
-from mypyc.ir.deps import LIBRT_BASE64, LIBRT_STRINGS
-from mypyc.codegen.emit import Emitter, EmitterContext, HeaderDeclaration, c_array_initializer, native_function_doc_initializer
+from mypyc.codegen.emit import (
+    Emitter,
+    EmitterContext,
+    HeaderDeclaration,
+    c_array_initializer,
+    native_function_doc_initializer,
+)
 from mypyc.codegen.emitclass import generate_class, generate_class_reuse, generate_class_type_decl
 from mypyc.codegen.emitfunc import generate_native_function, native_function_header
 from mypyc.codegen.emitwrapper import (
@@ -51,6 +56,7 @@
     short_id_from_name,
 )
 from mypyc.errors import Errors
+from mypyc.ir.deps import LIBRT_BASE64, LIBRT_STRINGS, SourceDep
 from mypyc.ir.func_ir import FuncIR
 from mypyc.ir.module_ir import ModuleIR, ModuleIRs, deserialize_modules
 from mypyc.ir.ops import DeserMaps, LoadLiteral
@@ -424,8 +430,6 @@ def load_scc_from_cache(
 
 def collect_source_dependencies(modules: dict[str, ModuleIR]) -> set[SourceDep]:
     """Collect all SourceDep dependencies from all modules."""
-    from mypyc.ir.deps import SourceDep
-
     source_deps: set[SourceDep] = set()
     for module in modules.values():
         for dep in module.dependencies:

mypyc/ir/deps.py

@@ -1,4 +1,4 @@
-from typing import Final, Union
+from typing import Final
 
 
 class Capsule:
@@ -34,10 +34,10 @@ def __hash__(self) -> int:
 
     def get_header(self) -> str:
         """Get the header file path by replacing .c with .h"""
-        return self.path.replace('.c', '.h')
+        return self.path.replace(".c", ".h")
 
 
-Dependency = Union[Capsule, SourceDep]
+Dependency = Capsule | SourceDep
 
 
 LIBRT_STRINGS: Final = Capsule("librt.strings")

mypyc/ir/ops.py

@@ -31,6 +31,7 @@ class to enable the new behavior. Sometimes adding a new abstract
 
 from mypy_extensions import trait
 
+from mypyc.ir.deps import Dependency
 from mypyc.ir.rtypes import (
     RArray,
     RInstance,
@@ -55,7 +56,6 @@ class to enable the new behavior. Sometimes adding a new abstract
     short_int_rprimitive,
     void_rtype,
 )
-from mypyc.ir.deps import Dependency
 
 if TYPE_CHECKING:
     from mypyc.codegen.literals import LiteralValue

mypyc/primitives/registry.py

@@ -39,9 +39,9 @@
 
 from typing import Final, NamedTuple
 
+from mypyc.ir.deps import Dependency
 from mypyc.ir.ops import PrimitiveDescription, StealsDescription
 from mypyc.ir.rtypes import RType
-from mypyc.ir.deps import Dependency
 
 # Error kind for functions that return negative integer on exception. This
 # is only used for primitives. We translate it away during IR building.

mypyc/test/test_cheader.py

@@ -7,8 +7,8 @@
 import re
 import unittest
 
-from mypyc.primitives import registry
 from mypyc.ir.deps import SourceDep
+from mypyc.primitives import registry
 
 
 class TestHeaderInclusion(unittest.TestCase):