Skip to content

Commit

Permalink
Rollup merge of #88813 - lcnr:ena-docs, r=jyn514
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Manishearth committed Sep 12, 2021
2 parents b3af37a + 03f9fe2 commit 146aee6
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/bootstrap/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 146aee6

Please sign in to comment.