hax

Author: shepmaster

src/bootstrap/src/core/build_steps/dist.rs

@@ -117,8 +117,8 @@ impl Step for JsonDocs {
     fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
         let target = self.target;
         let directory = builder.ensure(crate::core::build_steps::doc::Std::from_build_compiler(
-            self.build_compiler,
-            target,
+            dbg!(self.build_compiler),
+            dbg!(target),
             DocumentationFormat::Json,
         ));
 
@@ -127,7 +127,7 @@ impl Step for JsonDocs {
         let mut tarball = Tarball::new(builder, "rust-docs-json", &target.triple);
         tarball.set_product_name("Rust Documentation In JSON Format");
         tarball.is_preview(true);
-        tarball.add_bulk_dir(directory, dest);
+        tarball.add_bulk_dir(dbg!(directory), dest);
         Some(tarball.generate())
     }
 }

src/bootstrap/src/core/build_steps/doc.rs

@@ -748,7 +748,7 @@ fn doc_std(
     // We will then copy the files from this directory into the final `out` directory, the specified
     // as a function parameter.
     let out_dir = target_dir.join(target).join("doc");
-
+    dbg!(&out_dir, &out);
     let mut cargo = builder::Cargo::new(
         builder,
         build_compiler,
@@ -786,7 +786,7 @@ fn doc_std(
         format!("library{} in {} format", crate_description(requested_crates), format.as_str());
     let _guard = builder.msg(Kind::Doc, description, None, build_compiler, target);
 
-    cargo.into_cmd().run(builder);
+    dbg!(cargo.into_cmd()).run(builder);
     builder.cp_link_r(&out_dir, out);
 }
 

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

@@ -1158,9 +1158,9 @@ impl<'a> Builder<'a> {
                 doc::Compiletest,
             ),
             Kind::Dist => describe!(
+                dist::JsonDocs,
                 dist::Docs,
                 dist::RustcDocs,
-                dist::JsonDocs,
                 dist::Mingw,
                 dist::Rustc,
                 dist::CraneliftCodegenBackend,

src/bootstrap/src/utils/tarball.rs

@@ -397,14 +397,14 @@ impl<'a> Tarball<'a> {
                 .stdout();
             cmd.args(["--override-file-mtime", timestamp.trim()]);
         }
-
+dbg!(&cmd);
         cmd.run(self.builder);
 
         // Ensure there are no symbolic links in the tarball. In particular,
         // rustup-toolchain-install-master and most versions of Windows can't handle symbolic links.
         let decompressed_output = self.temp_dir.join(&package_name);
         if !self.builder.config.dry_run() && !self.permit_symlinks {
-            for entry in walkdir::WalkDir::new(&decompressed_output) {
+            for entry in walkdir::WalkDir::new(dbg!(&decompressed_output)) {
                 let entry = t!(entry);
                 if entry.path_is_symlink() {
                     panic!("generated a symlink in a tarball: {}", entry.path().display());