about summary refs log tree commit diff
path: root/src/ci/docker/scripts/android-sdk.sh
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-11 08:48:26 +0000
committerbors <bors@rust-lang.org>2019-04-11 08:48:26 +0000
commitee1474acc43fbf657b0fc910c139cf63cef34dc8 (patch)
treefd745ececfc824a079812d67b787133a4e04cad2 /src/ci/docker/scripts/android-sdk.sh
parentd21bebe18d6851f52ddcc404e875260560599521 (diff)
parent49cde404124c8217808c71972f206443f49bffc7 (diff)
downloadrust-ee1474acc43fbf657b0fc910c139cf63cef34dc8.tar.gz
rust-ee1474acc43fbf657b0fc910c139cf63cef34dc8.zip
Auto merge of #58972 - QuietMisdreavus:intra-doc-link-imports, r=GuillaumeGomez
rustdoc: don't process `Crate::external_traits` when collecting intra-doc links

Part of https://github.com/rust-lang/rust/issues/58745, closes https://github.com/rust-lang/rust/pull/58917

The `collect-intra-doc-links` pass keeps track of the modules it recurses through as it processes items. This is used to know what module to give the resolver when looking up links. When looking through the regular items of the crate, this works fine, but the `DocFolder` trait as written doesn't just process the main crate hierarchy - it also processes the trait items in the `external_traits` map. This is useful for other passes (so they can strip out `#[doc(hidden)]` items, for example), but here it creates a situation where we're processing items "outside" the regular module hierarchy. Since everything in `external_traits` is defined outside the current crate, we can't fall back to finding its module scope like we do with local items.

Skipping this collection saves us from emitting some spurious warnings. We don't even lose anything by skipping it, either - the docs loaded from here are only ever rendered through `html::render::document_short` which strips any links out, so the fact that the links haven't been loaded doesn't matter. Hopefully this removes most of the remaining spurious resolution warnings from intra-doc links.

r? @GuillaumeGomez
Diffstat (limited to 'src/ci/docker/scripts/android-sdk.sh')
0 files changed, 0 insertions, 0 deletions