Run ruff format in gen_exports.

src/trio/_core/_generated_io_epoll.py

@@ -18,7 +18,7 @@
 __all__ = ["notify_closing", "wait_readable", "wait_writable"]
 
 
-async def wait_readable(fd: int | _HasFileNo) -> None:
+async def wait_readable(fd: (int | _HasFileNo)) -> None:
     """Block until the kernel reports that the given object is readable.
 
     On Unix systems, ``fd`` must either be an integer file descriptor,
@@ -47,7 +47,7 @@ async def wait_readable(fd: int | _HasFileNo) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-async def wait_writable(fd: int | _HasFileNo) -> None:
+async def wait_writable(fd: (int | _HasFileNo)) -> None:
     """Block until the kernel reports that the given object is writable.
 
     See `wait_readable` for the definition of ``fd``.
@@ -66,7 +66,7 @@ async def wait_writable(fd: int | _HasFileNo) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-def notify_closing(fd: int | _HasFileNo) -> None:
+def notify_closing(fd: (int | _HasFileNo)) -> None:
     """Notify waiters of the given object that it will be closed.
 
     Call this before closing a file descriptor (on Unix) or socket (on

src/trio/_core/_generated_io_kqueue.py

@@ -71,7 +71,7 @@ async def wait_kevent(
         raise RuntimeError("must be called from async context") from None
 
 
-async def wait_readable(fd: int | _HasFileNo) -> None:
+async def wait_readable(fd: (int | _HasFileNo)) -> None:
     """Block until the kernel reports that the given object is readable.
 
     On Unix systems, ``fd`` must either be an integer file descriptor,
@@ -100,7 +100,7 @@ async def wait_readable(fd: int | _HasFileNo) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-async def wait_writable(fd: int | _HasFileNo) -> None:
+async def wait_writable(fd: (int | _HasFileNo)) -> None:
     """Block until the kernel reports that the given object is writable.
 
     See `wait_readable` for the definition of ``fd``.
@@ -119,7 +119,7 @@ async def wait_writable(fd: int | _HasFileNo) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-def notify_closing(fd: int | _HasFileNo) -> None:
+def notify_closing(fd: (int | _HasFileNo)) -> None:
     """Notify waiters of the given object that it will be closed.
 
     Call this before closing a file descriptor (on Unix) or socket (on

src/trio/_core/_generated_io_windows.py

@@ -32,7 +32,7 @@
 ]
 
 
-async def wait_readable(sock: _HasFileNo | int) -> None:
+async def wait_readable(sock: (_HasFileNo | int)) -> None:
     """Block until the kernel reports that the given object is readable.
 
     On Unix systems, ``sock`` must either be an integer file descriptor,
@@ -61,7 +61,7 @@ async def wait_readable(sock: _HasFileNo | int) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-async def wait_writable(sock: _HasFileNo | int) -> None:
+async def wait_writable(sock: (_HasFileNo | int)) -> None:
     """Block until the kernel reports that the given object is writable.
 
     See `wait_readable` for the definition of ``sock``.
@@ -80,7 +80,7 @@ async def wait_writable(sock: _HasFileNo | int) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-def notify_closing(handle: Handle | int | _HasFileNo) -> None:
+def notify_closing(handle: (Handle | int | _HasFileNo)) -> None:
     """Notify waiters of the given object that it will be closed.
 
     Call this before closing a file descriptor (on Unix) or socket (on
@@ -112,7 +112,7 @@ def notify_closing(handle: Handle | int | _HasFileNo) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-def register_with_iocp(handle: int | CData) -> None:
+def register_with_iocp(handle: (int | CData)) -> None:
     """TODO: these are implemented, but are currently more of a sketch than
     anything real. See `#26
     <https://github.com/python-trio/trio/issues/26>`__ and `#52
@@ -125,7 +125,9 @@ def register_with_iocp(handle: int | CData) -> None:
         raise RuntimeError("must be called from async context") from None
 
 
-async def wait_overlapped(handle_: int | CData, lpOverlapped: CData | int) -> object:
+async def wait_overlapped(
+    handle_: (int | CData), lpOverlapped: (CData | int)
+) -> object:
     """TODO: these are implemented, but are currently more of a sketch than
     anything real. See `#26
     <https://github.com/python-trio/trio/issues/26>`__ and `#52
@@ -141,7 +143,7 @@ async def wait_overlapped(handle_: int | CData, lpOverlapped: CData | int) -> ob
 
 
 async def write_overlapped(
-    handle: int | CData, data: Buffer, file_offset: int = 0
+    handle: (int | CData), data: Buffer, file_offset: int = 0
 ) -> int:
     """TODO: these are implemented, but are currently more of a sketch than
     anything real. See `#26
@@ -158,7 +160,7 @@ async def write_overlapped(
 
 
 async def readinto_overlapped(
-    handle: int | CData, buffer: Buffer, file_offset: int = 0
+    handle: (int | CData), buffer: Buffer, file_offset: int = 0
 ) -> int:
     """TODO: these are implemented, but are currently more of a sketch than
     anything real. See `#26

src/trio/_core/_generated_run.py

@@ -130,7 +130,7 @@ def spawn_system_task(
     async_fn: Callable[[Unpack[PosArgT]], Awaitable[object]],
     *args: Unpack[PosArgT],
     name: object = None,
-    context: contextvars.Context | None = None,
+    context: (contextvars.Context | None) = None,
 ) -> Task:
     """Spawn a "system" task.
 

src/trio/_tools/gen_exports.py

@@ -92,18 +92,43 @@ def create_passthrough_args(funcdef: ast.FunctionDef | ast.AsyncFunctionDef) ->
     Example input: ast.parse("def f(a, *, b): ...")
     Example output: "(a, b=b)"
     """
-    call_args = []
+    call_args: list[str] = []
     for arg in funcdef.args.args:
         call_args.append(arg.arg)
+
     if funcdef.args.vararg:
         call_args.append("*" + funcdef.args.vararg.arg)
+
     for arg in funcdef.args.kwonlyargs:
         call_args.append(arg.arg + "=" + arg.arg)
+
     if funcdef.args.kwarg:
         call_args.append("**" + funcdef.args.kwarg.arg)
+
     return "({})".format(", ".join(call_args))
 
 
+def run_ruff_format(file: File, source: str) -> tuple[bool, str]:
+    result = subprocess.run(
+        args=[
+            sys.executable,
+            "-m",
+            "ruff",
+            "format",
+            "--stdin-filename",
+            str(file.path),
+            "-",
+        ],
+        input=source,
+        capture_output=True,
+        encoding="utf8",
+    )
+
+    if result.returncode != 0:
+        return False, f"Failed to run ruff!\n{result.stderr}"
+    return True, result.stdout
+
+
 def run_ruff(file: File, source: str) -> tuple[bool, str]:
     """Run ruff on the specified file.
 
@@ -116,8 +141,6 @@ def run_ruff(file: File, source: str) -> tuple[bool, str]:
     Raises:
       ImportError: If ruff is not installed.
     """
-    # imported to check that `subprocess` calls will succeed
-    import ruff  # noqa: F401
 
     result = subprocess.run(
         # "-" as a filename = use stdin, return on stdout.
@@ -154,7 +177,13 @@ def run_linters(file: File, source: str) -> str:
       SystemExit: If either failed.
     """
 
-    success, response = run_ruff(file, source)
+    success, response = run_ruff_format(file, source)
+
+    if not success:  # pragma: no cover
+        print(response)
+        sys.exit(1)
+
+    success, response = run_ruff(file, response)
     if not success:  # pragma: no cover  # Test for run_ruff should catch
         print(response)
         sys.exit(1)
@@ -184,8 +213,8 @@ def gen_public_wrappers_source(file: File) -> str:
 
     generated = ["".join(header)]
 
-    source = astor.code_to_ast.parse_file(file.path)
-    method_names = []
+    source = ast.parse(file.path.read_text())
+    method_names: list[str] = []
     for method in get_public_methods(source):
         # Remove self from arguments
         assert method.args.args[0].arg == "self"
@@ -213,7 +242,7 @@ def gen_public_wrappers_source(file: File) -> str:
             del method.body[1:]
 
         # Create the function definition including the body
-        func = astor.to_source(method, indent_with=" " * 4)
+        func: str = astor.to_source(method, indent_with=" " * 4)  # type: ignore
 
         if is_cm:  # pragma: no cover
             func = func.replace("->Iterator", "->ContextManager")
@@ -249,20 +278,23 @@ def matches_disk_files(new_files: dict[str, str]) -> bool:
 
 
 def process(files: Iterable[File], *, do_test: bool) -> None:
-    new_files = {}
+    new_files: dict[str, str] = {}
+
     for file in files:
         print("Scanning:", file.path)
         new_source = gen_public_wrappers_source(file)
         new_source = run_linters(file, new_source)
         dirname, basename = os.path.split(file.path)
         new_path = os.path.join(dirname, PREFIX + basename)
         new_files[new_path] = new_source
+
     if do_test:
         if not matches_disk_files(new_files):
             print("Generated sources are outdated. Please regenerate.")
             sys.exit(1)
         else:
             print("Generated sources are up to date.")
+
     else:
         for new_path, new_source in new_files.items():
             with open(new_path, "w", encoding="utf-8") as f: