WIP

Author: Kobzol

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;