more fixes

Author: syphar

src/docbuilder/rustwide_builder.rs

@@ -550,7 +550,7 @@ impl RustwideBuilder {
                     build.fetch_build_std_dependencies(&targets)?;
                 }
 
-                self.execute_json_build(build_id, name, version, default_target, build, &metadata, &limits)?;
+                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();
@@ -579,7 +579,7 @@ impl RustwideBuilder {
                             .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, build, &metadata, &limits)?;
+                    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)?;
                 }
@@ -611,7 +611,9 @@ 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);
-                        self.execute_json_build(build_id, name, version, target, build, &metadata, &limits)?;
+                        if !metadata.proc_macro {
+                            self.execute_json_build(build_id, name, version, target, false, build, &metadata, &limits)?;
+                        }
                         let target_res = self.build_target(
                             target,
                             build,
@@ -830,6 +832,7 @@ impl RustwideBuilder {
         name: &str,
         version: &str,
         target: &str,
+        is_default_target: bool,
         build: &Build,
         metadata: &Metadata,
         limits: &Limits,
@@ -860,17 +863,17 @@ impl RustwideBuilder {
             return Ok(());
         }
 
-        // FIXME: support proc macro? just one time?
-        // let json_dir = if metadata.proc_macro {
-        //     let target_dir = build.host_target_dir();
-        //     let old_dir = target_dir.join("doc");
-        //     let new_dir = target_dir.join(target).join("doc");
-        //     debug!("rename {} to {}", old_dir.display(), new_dir.display());
-        //     std::fs::create_dir(target_dir.join(target))?;
-        //     std::fs::rename(old_dir, new_dir)?;
-        // };
-
-        let Some(json_filename) = fs::read_dir(build.host_target_dir().join(target).join("doc"))?
+        let json_dir = if metadata.proc_macro {
+            assert!(
+                is_default_target && target == HOST_TARGET,
+                "can't handle cross-compiling macros"
+            );
+            build.host_target_dir().join("doc")
+        } else {
+            build.host_target_dir().join(target).join("doc")
+        };
+
+        let Some(json_filename) = fs::read_dir(&json_dir)?
             .filter_map(|entry| {
                 let entry = entry.ok()?;
                 let path = entry.path();
@@ -884,7 +887,9 @@ impl RustwideBuilder {
         else {
             error!(
                 build_id = build_id.0,
-                target, "no JSON file found in target/doc after successful rustdoc json build"
+                json_dir = json_dir.to_str(),
+                target,
+                "no JSON file found in target/doc after successful rustdoc json build"
             );
             return Ok(());
         };
@@ -1443,16 +1448,15 @@ mod tests {
                     ))?);
 
                     let json_prefix = format!("rustdoc-json/{crate_}/{version}/{target}/");
-                    let json_files: Vec<_> = storage
+                    let mut json_files: Vec<_> = storage
                         .list_prefix(&json_prefix)
                         .filter_map(|res| res.ok())
+                        .map(|f| f.strip_prefix(&json_prefix).unwrap().to_owned())
                         .collect();
+                    json_files.sort();
                     dbg!(&json_files);
                     assert_eq!(
-                        json_files
-                            .into_iter()
-                            .map(|f| f.strip_prefix(&json_prefix).unwrap().to_owned())
-                            .collect::<Vec<_>>(),
+                        json_files,
                         vec![
                             "empty-library_1.0.0_i686-pc-windows-msvc_45.json.zst".to_string(),
                             "empty-library_1.0.0_i686-pc-windows-msvc_latest.json.zst".to_string(),