Remove --debug-build, add --cargo-profile instead

sharkdp · sharkdp · commit 5d335f901443 · 2025-10-15T12:16:58.000+02:00
diff --git a/mypy_primer/globals.py b/mypy_primer/globals.py
@@ -18,7 +18,7 @@ class _Args:
     type_checker: str
     mypyc_compile_level: int | None
     mypy_install_librt: bool
-    debug_build: bool
+    cargo_profile: str | None
 
     custom_typeshed_repo: str
     new_typeshed: str | None
@@ -94,9 +94,8 @@ def parse_options(argv: list[str]) -> _Args:
         ),
     )
     type_checker_group.add_argument(
-        "--debug-build",
-        action="store_true",
-        help="build the type checker in debug mode (only relevant for pyrefly/ty)",
+        "--cargo-profile",
+        help="cargo build profile to use (e.g., 'dev', 'release', or custom profiles; only relevant for pyrefly/ty)",
     )
     type_checker_group.add_argument(
         "--mypyc-compile-level",
@@ -240,9 +239,9 @@ def parse_options(argv: list[str]) -> _Args:
         parser.error("--shard-index and --num-shards must be used together")
     if ret.type_checker != "mypy" and ret.mypyc_compile_level is not None:
         parser.error("--mypyc-compile-level can only be used with --type-checker=mypy")
-    if ret.debug_build and ret.type_checker not in {"pyrefly", "ty"}:
+    if ret.cargo_profile is not None and ret.type_checker not in {"pyrefly", "ty"}:
         parser.error(
-            "`--debug-build` can only be used with `--type-checker=pyrefly` or `--type-checker=ty`"
+            "`--cargo-profile` can only be used with `--type-checker=pyrefly` or `--type-checker=ty`"
         )
 
     return ret
diff --git a/mypy_primer/main.py b/mypy_primer/main.py
@@ -19,7 +19,6 @@
 from mypy_primer.model import Project, TypeCheckResult
 from mypy_primer.projects import get_projects
 from mypy_primer.type_checker import (
-    RustBuildMode,
     setup_mypy,
     setup_pyrefly,
     setup_pyright,
@@ -55,14 +54,14 @@ def setup_type_checker(
         setup_fn = setup_ty
         kwargs = {
             "repo": ARGS.repo,
-            "build_mode": (RustBuildMode.DEBUG if ARGS.debug_build else RustBuildMode.RELEASE),
+            "build_profile": ARGS.cargo_profile or "release",
         }
     elif ARGS.type_checker == "pyrefly":
         setup_fn = setup_pyrefly
         kwargs = {
             "repo": ARGS.repo,
             "typeshed_dir": typeshed_dir,
-            "build_mode": (RustBuildMode.DEBUG if ARGS.debug_build else RustBuildMode.RELEASE),
+            "build_profile": ARGS.cargo_profile or "release",
         }
     else:
         raise ValueError(f"Unknown type checker {ARGS.type_checker}")
diff --git a/mypy_primer/type_checker.py b/mypy_primer/type_checker.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import enum
 import os
 import shutil
 import subprocess
@@ -132,7 +131,7 @@ async def setup_ty(
     ty_dir: Path,
     revision_like: RevisionLike,
     *,
-    build_mode: RustBuildMode,
+    build_profile: str,
     repo: str | None,
 ) -> Path:
     ty_dir.mkdir(parents=True, exist_ok=True)
@@ -148,7 +147,7 @@ async def setup_ty(
 
         try:
             await run(
-                ["cargo", "build", "--bin", "ty", *build_mode.flags()],
+                ["cargo", "build", "--bin", "ty", "--profile", build_profile],
                 cwd=repo_dir,
                 env=env,
                 output=True,
@@ -159,7 +158,9 @@ async def setup_ty(
             print(e.stderr, file=sys.stderr)
             raise e
 
-    ty_exe = cargo_target_dir / build_mode.artifact_directory() / "ty"
+    # Cargo uses "debug" as the directory name for the "dev" profile
+    artifact_dir = "debug" if build_profile == "dev" else build_profile
+    ty_exe = cargo_target_dir / artifact_dir / "ty"
     assert ty_exe.exists()
     return ty_exe
 
@@ -168,7 +169,7 @@ async def setup_pyrefly(
     pyrefly_dir: Path,
     revision_like: RevisionLike,
     *,
-    build_mode: RustBuildMode,
+    build_profile: str,
     repo: str | None,
     typeshed_dir: Path | None,
 ) -> Path:
@@ -187,7 +188,7 @@ async def setup_pyrefly(
     if not os.environ.get("MYPY_PRIMER_NO_REBUILD", False):
         try:
             await run(
-                ["cargo", "build", *build_mode.flags()],
+                ["cargo", "build", "--profile", build_profile],
                 cwd=repo_dir / "pyrefly",
                 env=env,
                 output=True,
@@ -198,7 +199,9 @@ async def setup_pyrefly(
             print(e.stderr, file=sys.stderr)
             raise e
 
-    pyrefly_exe = repo_dir / "target" / build_mode.artifact_directory() / "pyrefly"
+    # Cargo uses "debug" as the directory name for the "dev" profile
+    artifact_dir = "debug" if build_profile == "dev" else build_profile
+    pyrefly_exe = repo_dir / "target" / artifact_dir / "pyrefly"
     assert pyrefly_exe.exists()
     return pyrefly_exe
 
@@ -208,20 +211,3 @@ async def setup_typeshed(parent_dir: Path, *, repo: str, revision_like: Revision
         shutil.rmtree(parent_dir)
     parent_dir.mkdir(exist_ok=True)
     return await ensure_repo_at_revision(repo, parent_dir, revision_like)
-
-
-class RustBuildMode(enum.Enum):
-    RELEASE = "release"
-    DEBUG = "debug"
-
-    def flags(self) -> list[str]:
-        if self == RustBuildMode.RELEASE:
-            return ["--release"]
-        else:
-            return []
-
-    def artifact_directory(self) -> Path:
-        if self == RustBuildMode.RELEASE:
-            return Path("release")
-        else:
-            return Path("debug")
