about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2021-09-12 03:44:59 -0700
committerGitHub <noreply@github.com>2021-09-12 03:44:59 -0700
commit146aee66b1cc33ce0db4bc7ffe01d88145d6fb1f (patch)
treeb1618242d5dc6696a4a9259acc87bc73bcaa1cf8
parentb3af37ac7b9d5bd6dcd747a62382908dcb7c9ca9 (diff)
parent03f9fe2f2fa2555b0598a80a3c4ad135ca2a4368 (diff)
downloadrust-146aee66b1cc33ce0db4bc7ffe01d88145d6fb1f.tar.gz
rust-146aee66b1cc33ce0db4bc7ffe01d88145d6fb1f.zip
Rollup merge of #88813 - lcnr:ena-docs, r=jyn514
explicitly link to external `ena` docs

we currently do not link to the docs of `ena`: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_infer/infer/struct.InferCtxtInner.html#method.const_unification_table
-rw-r--r--src/bootstrap/doc.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index c8714117930..fbc7f19cb73 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -590,10 +590,18 @@ impl Step for Rustc {
         cargo.rustdocflag("-Znormalize-docs");
         cargo.rustdocflag("--show-type-layout");
         compile::rustc_cargo(builder, &mut cargo, target);
+        cargo.arg("-Zunstable-options");
         cargo.arg("-Zskip-rustdoc-fingerprint");
 
         // Only include compiler crates, no dependencies of those, such as `libc`.
+        // Do link to dependencies on `docs.rs` however using `rustdoc-map`.
         cargo.arg("--no-deps");
+        cargo.arg("-Zrustdoc-map");
+
+        // FIXME: `-Zrustdoc-map` does not yet correctly work for transitive dependencies,
+        // once this is no longer an issue the special case for `ena` can be removed.
+        cargo.rustdocflag("--extern-html-root-url");
+        cargo.rustdocflag("ena=https://docs.rs/ena/latest/");
 
         // Find dependencies for top level crates.
         let mut compiler_crates = HashSet::new();