Use Ruff for all formatting in pre-commit

Author: AA-Turner

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.6
+    rev: v0.11.7
     hooks:
       - id: ruff
         name: Run Ruff (lint) on Doc/
@@ -22,16 +22,13 @@ repos:
         name: Run Ruff (format) on Doc/
         args: [--check]
         files: ^Doc/
-
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.1.0
-    hooks:
-      - id: black
-        name: Run Black on Tools/build/check_warnings.py
+      - id: ruff-format
+        name: Run Ruff (format) on Tools/build/check_warnings.py
+        args: [--check, --config=Tools/build/.ruff.toml]
         files: ^Tools/build/check_warnings.py
-        args: [--line-length=79]
-      - id: black
-        name: Run Black on Tools/jit/
+      - id: ruff-format
+        name: Run Ruff (format) on Tools/jit/
+        args: [--check]
         files: ^Tools/jit/
 
   - repo: https://github.com/pre-commit/pre-commit-hooks

Tools/build/check_warnings.py

@@ -151,7 +151,6 @@ def get_unexpected_warnings(
     """
     unexpected_warnings = {}
     for file in files_with_warnings.keys():
-
         rule = is_file_ignored(file, ignore_rules)
 
         if rule:

Tools/jit/_llvm.py

@@ -21,9 +21,7 @@ def _async_cache(f: _C[_P, _R]) -> _C[_P, _R]:
     lock = asyncio.Lock()
 
     @functools.wraps(f)
-    async def wrapper(
-        *args: _P.args, **kwargs: _P.kwargs  # pylint: disable = no-member
-    ) -> _R:
+    async def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> _R:
         async with lock:
             if args not in cache:
                 cache[args] = await f(*args, **kwargs)

Tools/jit/_stencils.py

@@ -230,35 +230,41 @@ def remove_jump(self) -> None:
         """Remove a zero-length continuation jump, if it exists."""
         hole = max(self.holes, key=lambda hole: hole.offset)
         match hole:
-            case Hole(
-                offset=offset,
-                kind="IMAGE_REL_AMD64_REL32",
-                value=HoleValue.GOT,
-                symbol="_JIT_CONTINUE",
-                addend=-4,
-            ) as hole:
+            case (
+                Hole(
+                    offset=offset,
+                    kind="IMAGE_REL_AMD64_REL32",
+                    value=HoleValue.GOT,
+                    symbol="_JIT_CONTINUE",
+                    addend=-4,
+                ) as hole
+            ):
                 # jmp qword ptr [rip]
                 jump = b"\x48\xff\x25\x00\x00\x00\x00"
                 offset -= 3
-            case Hole(
-                offset=offset,
-                kind="IMAGE_REL_I386_REL32" | "R_X86_64_PLT32" | "X86_64_RELOC_BRANCH",
-                value=HoleValue.CONTINUE,
-                symbol=None,
-                addend=addend,
-            ) as hole if (
-                _signed(addend) == -4
-            ):
+            case (
+                Hole(
+                    offset=offset,
+                    kind="IMAGE_REL_I386_REL32"
+                    | "R_X86_64_PLT32"
+                    | "X86_64_RELOC_BRANCH",
+                    value=HoleValue.CONTINUE,
+                    symbol=None,
+                    addend=addend,
+                ) as hole
+            ) if _signed(addend) == -4:
                 # jmp 5
                 jump = b"\xe9\x00\x00\x00\x00"
                 offset -= 1
-            case Hole(
-                offset=offset,
-                kind="R_AARCH64_JUMP26",
-                value=HoleValue.CONTINUE,
-                symbol=None,
-                addend=0,
-            ) as hole:
+            case (
+                Hole(
+                    offset=offset,
+                    kind="R_AARCH64_JUMP26",
+                    value=HoleValue.CONTINUE,
+                    symbol=None,
+                    addend=0,
+                ) as hole
+            ):
                 # b #4
                 jump = b"\x00\x00\x00\x14"
             case _:

Tools/jit/_targets.py

@@ -224,9 +224,7 @@ def build(
             jit_stencils_new.unlink(missing_ok=True)
 
 
-class _COFF(
-    _Target[_schema.COFFSection, _schema.COFFRelocation]
-):  # pylint: disable = too-few-public-methods
+class _COFF(_Target[_schema.COFFSection, _schema.COFFRelocation]):
     def _handle_section(
         self, section: _schema.COFFSection, group: _stencils.StencilGroup
     ) -> None:
@@ -312,9 +310,7 @@ def _handle_relocation(
         return _stencils.Hole(offset, kind, value, symbol, addend)
 
 
-class _ELF(
-    _Target[_schema.ELFSection, _schema.ELFRelocation]
-):  # pylint: disable = too-few-public-methods
+class _ELF(_Target[_schema.ELFSection, _schema.ELFRelocation]):
     def _handle_section(
         self, section: _schema.ELFSection, group: _stencils.StencilGroup
     ) -> None:
@@ -402,9 +398,7 @@ def _handle_relocation(
         return _stencils.Hole(offset, kind, value, symbol, addend)
 
 
-class _MachO(
-    _Target[_schema.MachOSection, _schema.MachORelocation]
-):  # pylint: disable = too-few-public-methods
+class _MachO(_Target[_schema.MachOSection, _schema.MachORelocation]):
     def _handle_section(
         self, section: _schema.MachOSection, group: _stencils.StencilGroup
     ) -> None: