try refactor

Author: syphar

src/docbuilder/rustwide_builder.rs

@@ -335,8 +335,18 @@ impl RustwideBuilder {
             .run(|build| {
                 let metadata = Metadata::from_crate_root(build.host_source_dir())?;
 
-                let res =
-                    self.execute_build(HOST_TARGET, true, build, &limits, &metadata, true, false)?;
+                let res = self.execute_build(
+                    BuildId(0),
+                    DUMMY_CRATE_NAME,
+                    DUMMY_CRATE_VERSION,
+                    HOST_TARGET,
+                    true,
+                    build,
+                    &limits,
+                    &metadata,
+                    true,
+                    false,
+                )?;
                 if !res.result.successful {
                     bail!("failed to build dummy crate for {}", rustc_version);
                 }
@@ -550,14 +560,13 @@ impl RustwideBuilder {
                     build.fetch_build_std_dependencies(&targets)?;
                 }
 
-                self.execute_json_build(build_id, name, version, default_target, true, build, &metadata, &limits)?;
 
                 let mut has_docs = false;
                 let mut successful_targets = Vec::new();
 
                 // Perform an initial build
                 let mut res =
-                    self.execute_build(default_target, true, build, &limits, &metadata, false, collect_metrics)?;
+                    self.execute_build(build_id, name, version, default_target, true, build, &limits, &metadata, false, collect_metrics)?;
 
                 // If the build fails with the lockfile given, try using only the dependencies listed in Cargo.toml.
                 let cargo_lock = build.host_source_dir().join("Cargo.lock");
@@ -578,10 +587,8 @@ impl RustwideBuilder {
                             .args(&["fetch", "--locked"])
                             .run_capture()?;
                     }
-                    // let's assume the JSON build also failed when the main build failed
-                    self.execute_json_build(build_id, name, version, default_target, true, build, &metadata, &limits)?;
                     res =
-                        self.execute_build(default_target, true, build, &limits, &metadata, false, collect_metrics)?;
+                        self.execute_build(build_id, name, version, default_target, true, build, &limits, &metadata, false, collect_metrics)?;
                 }
 
                 if res.result.successful {
@@ -611,10 +618,8 @@ impl RustwideBuilder {
                     // Limit the number of targets so that no one can try to build all 200000 possible targets
                     for target in other_targets.into_iter().take(limits.targets()) {
                         debug!("building package {} {} for {}", name, version, target);
-                        if !metadata.proc_macro {
-                            self.execute_json_build(build_id, name, version, target, false, build, &metadata, &limits)?;
-                        }
                         let target_res = self.build_target(
+                            build_id, name, version,
                             target,
                             build,
                             &limits,
@@ -790,6 +795,9 @@ impl RustwideBuilder {
     #[allow(clippy::too_many_arguments)]
     fn build_target(
         &self,
+        build_id: BuildId,
+        name: &str,
+        version: &str,
         target: &str,
         build: &Build,
         limits: &Limits,
@@ -799,6 +807,9 @@ impl RustwideBuilder {
         collect_metrics: bool,
     ) -> Result<FullBuildResult> {
         let target_res = self.execute_build(
+            build_id,
+            name,
+            version,
             target,
             false,
             build,
@@ -975,6 +986,9 @@ impl RustwideBuilder {
     #[allow(clippy::too_many_arguments)]
     fn execute_build(
         &self,
+        build_id: BuildId,
+        name: &str,
+        version: &str,
         target: &str,
         is_default_target: bool,
         build: &Build,
@@ -1017,6 +1031,17 @@ impl RustwideBuilder {
             }
         };
 
+        self.execute_json_build(
+            build_id,
+            name,
+            version,
+            target,
+            is_default_target,
+            build,
+            metadata,
+            limits,
+        )?;
+
         let successful = {
             let _span = info_span!("cargo_build", target = %target, is_default_target).entered();
             logging::capture(&storage, || {