Auto merge of #140786 - Kobzol:try-builds-no-deny-warnings, r=<try>

Do not deny warnings in "fast" try builds

When we do the classic ``@bors` try` build without specifying `try-job` in the PR description, we want to get a compiler toolchain for perf./crater/local experimentation as fast as possible. We don't run any tests in that case, so it seems reasonable to also ignore warnings.

Fixes: #140753

Author: bors

Cargo.lock

@@ -2567,7 +2567,6 @@ dependencies = [
  "humansize",
  "humantime",
  "log",
- "serde",
  "serde_json",
  "sysinfo",
  "tabled",

library/core/src/alloc/mod.rs

@@ -42,6 +42,7 @@ impl Error for AllocError {}
 #[unstable(feature = "allocator_api", issue = "32838")]
 impl fmt::Display for AllocError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let a = 5;
         f.write_str("memory allocation failed")
     }
 }

src/bootstrap/bootstrap.py

@@ -204,7 +204,7 @@ def unpack(tarball, tarball_suffix, dst, verbose=False, match=None):
             name = member.replace(fname + "/", "", 1)
             if match is not None and not name.startswith(match):
                 continue
-            name = name[len(match) + 1 :]
+            name = name[len(match) + 1:]
 
             dst_path = os.path.join(dst, name)
             if verbose:
@@ -486,15 +486,15 @@ class DownloadInfo:
     """A helper class that can be pickled into a parallel subprocess"""
 
     def __init__(
-        self,
-        base_download_url,
-        download_path,
-        bin_root,
-        tarball_path,
-        tarball_suffix,
-        stage0_data,
-        pattern,
-        verbose,
+            self,
+            base_download_url,
+            download_path,
+            bin_root,
+            tarball_path,
+            tarball_suffix,
+            stage0_data,
+            pattern,
+            verbose,
     ):
         self.base_download_url = base_download_url
         self.download_path = download_path
@@ -576,7 +576,7 @@ def __init__(self, config_toml="", args=None):
             self.stage0_data["compiler_date"], self.stage0_data["compiler_version"]
         )
         self.download_url = (
-            os.getenv("RUSTUP_DIST_SERVER") or self.stage0_data["dist_server"]
+                os.getenv("RUSTUP_DIST_SERVER") or self.stage0_data["dist_server"]
         )
 
         self.build = args.build or self.build_triple()
@@ -597,10 +597,10 @@ def download_toolchain(self):
         key = self.stage0_compiler.date
         is_outdated = self.program_out_of_date(self.rustc_stamp(), key)
         need_rustc = self.rustc().startswith(bin_root) and (
-            not os.path.exists(self.rustc()) or is_outdated
+                not os.path.exists(self.rustc()) or is_outdated
         )
         need_cargo = self.cargo().startswith(bin_root) and (
-            not os.path.exists(self.cargo()) or is_outdated
+                not os.path.exists(self.cargo()) or is_outdated
         )
 
         if need_rustc or need_cargo:
@@ -617,10 +617,10 @@ def download_toolchain(self):
                     script = (
                         # NOTE: can't use `taskkill` or `Get-Process -Name` because they error if
                         # the server isn't running.
-                        "Get-Process | "
-                        + 'Where-Object {$_.Name -eq "rust-analyzer-proc-macro-srv"} |'
-                        + 'Where-Object {{$_.Path -match "{}"}} |'.format(regex)
-                        + "Stop-Process"
+                            "Get-Process | "
+                            + 'Where-Object {$_.Name -eq "rust-analyzer-proc-macro-srv"} |'
+                            + 'Where-Object {{$_.Path -match "{}"}} |'.format(regex)
+                            + "Stop-Process"
                     )
                     run_powershell([script])
                 shutil.rmtree(bin_root)
@@ -844,7 +844,7 @@ def fix_bin_or_dylib(self, fname):
         if ".so" not in fname:
             # Finally, set the correct .interp for binaries
             with open(
-                "{}/nix-support/dynamic-linker".format(nix_deps_dir)
+                    "{}/nix-support/dynamic-linker".format(nix_deps_dir)
             ) as dynamic_linker:
                 patchelf_args += ["--set-interpreter", dynamic_linker.read().rstrip()]
 
@@ -968,12 +968,12 @@ def get_string(line):
         """
         start = line.find('"')
         if start != -1:
-            end = start + 1 + line[start + 1 :].find('"')
-            return line[start + 1 : end]
+            end = start + 1 + line[start + 1:].find('"')
+            return line[start + 1: end]
         start = line.find("'")
         if start != -1:
-            end = start + 1 + line[start + 1 :].find("'")
-            return line[start + 1 : end]
+            end = start + 1 + line[start + 1:].find("'")
+            return line[start + 1: end]
         return None
 
     def bootstrap_out(self):
@@ -1109,6 +1109,7 @@ def build_bootstrap_cmd(self, env):
         else:
             deny_warnings = self.warnings == "deny"
         if deny_warnings:
+            print("DENYING WARNINGS IN PYTHON")
             env["RUSTFLAGS"] += " -Dwarnings"
 
         # Add RUSTFLAGS_BOOTSTRAP to RUSTFLAGS for bootstrap compilation.
@@ -1267,7 +1268,7 @@ def bootstrap(args):
     rust_root = os.path.abspath(os.path.join(__file__, "../../.."))
 
     if not os.path.exists(os.path.join(rust_root, ".git")) and os.path.exists(
-        os.path.join(rust_root, ".github")
+            os.path.join(rust_root, ".github")
     ):
         eprint(
             "warn: Looks like you are trying to bootstrap Rust from a source that is neither a "

src/bootstrap/src/core/builder/cargo.rs

@@ -1062,6 +1062,7 @@ impl Builder<'_> {
             lint_flags.push("-Wunused_lifetimes");
 
             if self.config.deny_warnings {
+                eprintln!("DENYING WARNINGS IN BOOTSTRAP");
                 lint_flags.push("-Dwarnings");
                 rustdocflags.arg("-Dwarnings");
             }

src/bootstrap/src/core/builder/mod.rs

@@ -1478,6 +1478,7 @@ impl<'a> Builder<'a> {
         cmd.arg("-Wrustdoc::invalid_codeblock_attributes");
 
         if self.config.deny_warnings {
+            eprintln!("DENYING WARNINGS FOR RUSTDOC IN BOOTSTRAP");
             cmd.arg("-Dwarnings");
         }
         cmd.arg("-Znormalize-docs");

src/bootstrap/src/core/config/config.rs

@@ -1693,6 +1693,7 @@ impl Config {
         }
 
         let mut override_toml = TomlConfig::default();
+        eprintln!("BOOTSTRAP SET FLAGS: {:?}", flags.set);
         for option in flags.set.iter() {
             fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
                 toml::from_str(option).and_then(|table: toml::Value| TomlConfig::deserialize(table))
@@ -1731,7 +1732,13 @@ impl Config {
             eprintln!("failed to parse override `{option}`: `{err}");
             exit!(2)
         }
+        if let Some(r) = override_toml.rust.as_ref() {
+            eprintln!("BOOTSTRAP OVERRIDE TOML: {:?}", r.deny_warnings);
+        }
         toml.merge(None, &mut Default::default(), override_toml, ReplaceOpt::Override);
+        if let Some(r) = toml.rust.as_ref() {
+            eprintln!("BOOTSTRAP TOML AFTER OVERRIDE: {:?}", r.deny_warnings);
+        }
 
         config.change_id = toml.change_id.inner;
 
@@ -2142,6 +2149,10 @@ impl Config {
                     Warnings::Default => deny_warnings,
                 },
             );
+            eprintln!(
+                "SETTING DENY WARNINGS TO {}, flags: {:?}",
+                config.deny_warnings, flags.warnings
+            );
             set(&mut config.backtrace_on_ice, backtrace_on_ice);
             set(&mut config.rust_verify_llvm_ir, verify_llvm_ir);
             config.rust_thin_lto_import_instr_limit = thin_lto_import_instr_limit;

src/tools/opt-dist/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "opt-dist"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 build_helper = { path = "../../build_helper" }
@@ -15,7 +15,6 @@ fs_extra = "1"
 camino = "1"
 tar = "0.4"
 xz = { version = "0.1", package = "xz2" }
-serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 glob = "0.3"
 tempfile = "3.5"

src/tools/opt-dist/src/environment.rs

@@ -26,6 +26,7 @@ pub struct Environment {
     use_bolt: bool,
     shared_llvm: bool,
     run_tests: bool,
+    fast_try_build: bool,
 }
 
 impl Environment {
@@ -106,6 +107,10 @@ impl Environment {
     pub fn run_tests(&self) -> bool {
         self.run_tests
     }
+
+    pub fn is_fast_try_build(&self) -> bool {
+        self.fast_try_build
+    }
 }
 
 /// What is the extension of binary executables on this platform?

src/tools/opt-dist/src/exec.rs

@@ -23,6 +23,13 @@ impl CmdBuilder {
         self
     }
 
+    pub fn args(mut self, args: &[&str]) -> Self {
+        for arg in args {
+            self.args.push(arg.to_string());
+        }
+        self
+    }
+
     pub fn env(mut self, name: &str, value: &str) -> Self {
         self.env.insert(name.to_string(), value.to_string());
         self
@@ -113,13 +120,16 @@ impl Bootstrap {
             "library/std",
         ])
         .env("RUST_BACKTRACE", "full");
+        let cmd = add_shared_x_flags(env, cmd);
+
         Self { cmd, metrics_path }
     }
 
     pub fn dist(env: &Environment, dist_args: &[String]) -> Self {
         let metrics_path = env.build_root().join("build").join("metrics.json");
-        let cmd = cmd(&dist_args.iter().map(|arg| arg.as_str()).collect::<Vec<_>>())
-            .env("RUST_BACKTRACE", "full");
+        let args = dist_args.iter().map(|arg| arg.as_str()).collect::<Vec<_>>();
+        let cmd = cmd(&args).env("RUST_BACKTRACE", "full");
+        let cmd = add_shared_x_flags(env, cmd);
         Self { cmd, metrics_path }
     }
 
@@ -184,3 +194,7 @@ impl Bootstrap {
         Ok(())
     }
 }
+
+fn add_shared_x_flags(env: &Environment, cmd: CmdBuilder) -> CmdBuilder {
+    if env.is_fast_try_build() { cmd.arg("--set").arg("rust.deny-warnings=false") } else { cmd }
+}

src/tools/opt-dist/src/main.rs

@@ -111,11 +111,13 @@ enum EnvironmentCmd {
     },
 }
 
-fn is_try_build() -> bool {
+/// Are we supposed to only build the bare minimum of components to get a working toolchain?
+fn is_fast_try_build() -> bool {
     std::env::var("DIST_TRY_BUILD").unwrap_or_else(|_| "0".to_string()) != "0"
 }
 
 fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)> {
+    let is_fast_try_build = is_fast_try_build();
     let (env, args) = match args.env {
         EnvironmentCmd::Local {
             target_triple,
@@ -144,6 +146,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
                 .skipped_tests(skipped_tests)
                 .benchmark_cargo_config(benchmark_cargo_config)
                 .run_tests(run_tests)
+                .fast_try_build(is_fast_try_build)
                 .build()?;
 
             (env, shared.build_args)
@@ -167,6 +170,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
                 .use_bolt(!is_aarch64)
                 .skipped_tests(vec![])
                 .run_tests(true)
+                .fast_try_build(is_fast_try_build)
                 .build()?;
 
             (env, shared.build_args)
@@ -187,6 +191,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
                 .use_bolt(false)
                 .skipped_tests(vec![])
                 .run_tests(true)
+                .fast_try_build(is_fast_try_build)
                 .build()?;
 
             (env, shared.build_args)
@@ -352,7 +357,7 @@ fn execute_pipeline(
     // possible regressions.
     // The tests are not executed for try builds, which can be in various broken states, so we don't
     // want to gatekeep them with tests.
-    if !is_try_build() && env.run_tests() {
+    if !is_fast_try_build() && env.run_tests() {
         timer.section("Run tests", |_| run_tests(env))?;
     }
 
@@ -361,7 +366,10 @@ fn execute_pipeline(
 
 fn main() -> anyhow::Result<()> {
     // Make sure that we get backtraces for easier debugging in CI
-    std::env::set_var("RUST_BACKTRACE", "1");
+    unsafe {
+        // SAFETY: we are the only thread running at this point
+        std::env::set_var("RUST_BACKTRACE", "1");
+    }
 
     env_logger::builder()
         .filter_level(LevelFilter::Info)
@@ -394,7 +402,7 @@ fn main() -> anyhow::Result<()> {
     let (env, mut build_args) = create_environment(args).context("Cannot create environment")?;
 
     // Skip components that are not needed for try builds to speed them up
-    if is_try_build() {
+    if is_fast_try_build() {
         log::info!("Skipping building of unimportant components for a try build");
         for target in [
             "rust-docs",