Use -Z rustdoc-map instead of rewriting it

Author: jyn514

crates/metadata/lib.rs

@@ -229,7 +229,8 @@ impl Metadata {
     /// For example, the links may point somewhere different than they would on docs.rs.
     /// However, rustdoc will see exactly the same code as it would on docs.rs, even counting `cfg`s.
     pub fn cargo_args(&self, additional_args: &[String], rustdoc_args: &[String]) -> Vec<String> {
-        let mut cargo_args: Vec<String> = vec!["rustdoc".into(), "--lib".into()];
+        let mut cargo_args: Vec<String> =
+            vec!["rustdoc".into(), "--lib".into(), "-Zrustdoc-map".into()];
 
         if let Some(features) = &self.features {
             cargo_args.push("--features".into());

src/docbuilder/rustwide_builder.rs

@@ -518,16 +518,6 @@ impl RustwideBuilder {
 
         let mut rustdoc_flags = Vec::new();
 
-        for dep in &cargo_metadata.root_dependencies() {
-            rustdoc_flags.push("--extern-html-root-url".to_string());
-            rustdoc_flags.push(format!(
-                "{}=https://docs.rs/{}/{}",
-                dep.name.replace("-", "_"),
-                dep.name,
-                dep.version
-            ));
-        }
-
         rustdoc_flags.extend(vec![
             "--resource-suffix".to_string(),
             format!("-{}", parse_rustc_version(&self.rustc_version)?),

src/utils/cargo_metadata.rs

@@ -1,13 +1,11 @@
 use crate::error::Result;
 use rustwide::{cmd::Command, Toolchain, Workspace};
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::path::Path;
 
 pub(crate) struct CargoMetadata {
-    packages: HashMap<String, Package>,
-    deps_graph: HashMap<String, HashSet<String>>,
-    root_id: String,
+    root: Package,
 }
 
 impl CargoMetadata {
@@ -31,34 +29,18 @@ impl CargoMetadata {
             ));
         };
 
-        // Convert from Vecs to HashMaps and HashSets to get more efficient lookups
+        let root = metadata.resolve.root;
         Ok(CargoMetadata {
-            packages: metadata
+            root: metadata
                 .packages
                 .into_iter()
-                .map(|pkg| (pkg.id.clone(), pkg))
-                .collect(),
-            deps_graph: metadata
-                .resolve
-                .nodes
-                .into_iter()
-                .map(|node| (node.id, node.deps.into_iter().map(|d| d.pkg).collect()))
-                .collect(),
-            root_id: metadata.resolve.root,
+                .find(|pkg| pkg.id == root)
+                .unwrap(),
         })
     }
 
-    pub(crate) fn root_dependencies(&self) -> Vec<&Package> {
-        let ids = &self.deps_graph[&self.root_id];
-        self.packages
-            .iter()
-            .filter(|(id, _pkg)| ids.contains(id.as_str()))
-            .map(|(_id, pkg)| pkg)
-            .collect()
-    }
-
     pub(crate) fn root(&self) -> &Package {
-        &self.packages[&self.root_id]
+        &self.root
     }
 }