diff options
| author | bors <bors@rust-lang.org> | 2022-05-04 05:01:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-04 05:01:47 +0000 |
| commit | 21d613b1116eef86d613d5f7f10d8fa5f22e27b3 (patch) | |
| tree | f08b424e3a630aec38f6559a14a8668aa29ed03e /src/librustdoc | |
| parent | 9add63257bd3968a7b7ea3372db9d548561e3396 (diff) | |
| parent | 6d590ba9426f60459c66d19f73b52f774e23e308 (diff) | |
| download | rust-21d613b1116eef86d613d5f7f10d8fa5f22e27b3.tar.gz rust-21d613b1116eef86d613d5f7f10d8fa5f22e27b3.zip | |
Auto merge of #96447 - petrochenkov:docregr, r=GuillaumeGomez
rustdoc: Resolve doc links on fields during early resolution Another subset of https://github.com/rust-lang/rust/pull/94857 which fixes https://github.com/rust-lang/rust/issues/96429. This case regressed in https://github.com/rust-lang/rust/pull/96135 when `may_have_doc_links`-based filtering was introduced. Before that filtering structs could collect traits in scope for their fields, but after the filtering structs won't collect anything if they don't have doc comments on them, so we have to visit fields too.
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/passes/collect_intra_doc_links/early.rs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links/early.rs b/src/librustdoc/passes/collect_intra_doc_links/early.rs index 1d2ef832db7..07d05cab1d1 100644 --- a/src/librustdoc/passes/collect_intra_doc_links/early.rs +++ b/src/librustdoc/passes/collect_intra_doc_links/early.rs @@ -293,10 +293,22 @@ impl<'ra> EarlyDocLinkResolver<'_, 'ra> { if let Res::Def(DefKind::Mod, ..) = child.res { self.resolve_doc_links_extern_inner(def_id); // Inner attribute scope } - // Traits are processed in `add_extern_traits_in_scope`. + // `DefKind::Trait`s are processed in `process_extern_impls`. if let Res::Def(DefKind::Mod | DefKind::Enum, ..) = child.res { self.process_module_children_or_reexports(def_id); } + if let Res::Def(DefKind::Struct | DefKind::Union | DefKind::Variant, _) = + child.res + { + let field_def_ids = Vec::from_iter( + self.resolver + .cstore() + .associated_item_def_ids_untracked(def_id, self.sess), + ); + for field_def_id in field_def_ids { + self.resolve_doc_links_extern_outer(field_def_id, scope_id); + } + } } } } |
