update

Author: tgross35

ci/verify-build.py

@@ -202,11 +202,11 @@ def __post_init__(self):
 ]
 
 
-def eprint(*args, **kw):
+def eprint(*args, **kw) -> None:
     print(*args, file=sys.stderr, **kw)
 
 
-def xtrace(args: Sequence[str | Path], /, env: Optional[dict[str, str]]):
+def xtrace(args: Sequence[str | Path], /, env: Optional[dict[str, str]]) -> None:
     """Print commands before running them."""
     astr = " ".join(str(arg) for arg in args)
     if env is None:
@@ -224,12 +224,12 @@ def check_output(
     return sp.check_output(args, env=env, encoding="utf8")
 
 
-def run(args: Sequence[str | Path], /, env: Optional[dict[str, str]] = None):
+def run(args: Sequence[str | Path], /, env: Optional[dict[str, str]] = None) -> None:
     xtrace(args, env=env)
     sp.run(args, env=env, check=True)
 
 
-def check_dup_targets():
+def check_dup_targets() -> None:
     """Ensure there are no duplicate targets in the list."""
     all = set()
     duplicates = set()
@@ -240,7 +240,7 @@ def check_dup_targets():
     assert len(duplicates) == 0, f"duplicate targets: {duplicates}"
 
 
-def do_semver_checks(cfg: Cfg, target: Target):
+def do_semver_checks(cfg: Cfg, target: Target) -> None:
     tname = target.name
     if cfg.toolchain != Toolchain.STABLE:
         eprint("Skipping semver checks")
@@ -276,10 +276,13 @@ def do_semver_checks(cfg: Cfg, target: Target):
     eprint("Running semver checks with cross compilation")
 
     env = os.environ.copy()
+    env.setdefault("RUSTFLAGS", "")
     cmd = ["cargo", "rustdoc", "--target", tname]
     rustdoc_args = ["--", "-Zunstable-options", "--output-format=json"]
 
     run([*cmd, *rustdoc_args], env=env | {"RUSTC_BOOTSTRAP": "1"})
+
+    env["RUSTFLAGS"] += " -Awarnings"  # Don't lint the baseline
     run(
         [*cmd, "--manifest-path", cfg.baseline_crate_dir, *rustdoc_args],
         env=env | {"RUSTC_BOOTSTRAP": "1"},
@@ -301,7 +304,7 @@ def do_semver_checks(cfg: Cfg, target: Target):
     )
 
 
-def test_target(cfg: Cfg, target: Target):
+def test_target(cfg: Cfg, target: Target) -> None:
     """Run tests for a single target."""
     start = time.time()
     env = os.environ.copy()
@@ -328,14 +331,15 @@ def test_target(cfg: Cfg, target: Target):
     if not target.dist:
         # If we can't download a `core`, we need to build it
         cmd += ["-Zbuild-std=core"]
-        # FIXME: With `build-std` feature, `compiler_builtins` emits a lot of lint warnings.
+        # FIXME: With `the build-std` feature, `compiler_builtins` emits a lot of
+        # lint warnings.
         env["RUSTFLAGS"] += " -Aimproper_ctypes_definitions"
     else:
         run(["rustup", "target", "add", tname, "--toolchain", cfg.toolchain_name])
 
     # Test with expected combinations of features
     run(cmd, env=env)
-    run(cmd + ["--features=extra_traits"], env=env)
+    run([*cmd, "--features=extra_traits"], env=env)
 
     # Check with different env for 64-bit time_t
     if target_os == "linux" and target_bits == "32":
@@ -353,20 +357,20 @@ def test_target(cfg: Cfg, target: Target):
         run(cmd, env=env | {"RUST_LIBC_UNSTABLE_MUSL_V1_2_3": "1"})
 
     # Test again without default features, i.e. without `std`
-    run(cmd + ["--no-default-features"])
-    run(cmd + ["--no-default-features", "--features=extra_traits"])
+    run([*cmd, "--no-default-features"])
+    run([*cmd, "--no-default-features", "--features=extra_traits"])
 
     # Ensure the crate will build when used as a dependency of `std`
     if cfg.nightly():
-        run(cmd + ["--no-default-features", "--features=rustc-dep-of-std"])
+        run([*cmd, "--no-default-features", "--features=rustc-dep-of-std"])
 
     # For freebsd targets, check with the different versions we support
     # if on nightly or stable
     if "freebsd" in tname and cfg.toolchain >= Toolchain.STABLE:
         for version in FREEBSD_VERSIONS:
             run(cmd, env=env | {"RUST_LIBC_UNSTABLE_FREEBSD_VERSION": str(version)})
             run(
-                cmd + ["--no-default-features"],
+                [*cmd, "--no-default-features"],
                 env=env | {"RUST_LIBC_UNSTABLE_FREEBSD_VERSION": str(version)},
             )
 
@@ -376,7 +380,7 @@ def test_target(cfg: Cfg, target: Target):
     eprint(f"Finished checking target {tname} in {elapsed} seconds")
 
 
-def main():
+def main() -> None:
     p = argparse.ArgumentParser()
     p.add_argument("--toolchain", required=True, help="Rust toolchain")
     p.add_argument("--only", help="only targets matching this regex")