diff options
| author | bors <bors@rust-lang.org> | 2022-11-02 07:47:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-02 07:47:10 +0000 |
| commit | 822f8c22f540b12f296d844ad5bf39aaa47bfeb4 (patch) | |
| tree | 2f30c0285596f8ac3c5509238be43873a6b7ae76 | |
| parent | a876a4df32b402e3886cd9f2af02cff3dd8e21c8 (diff) | |
| parent | 59b8ff97b2e15e4058a9d931e525572728c6ef0e (diff) | |
| download | rust-822f8c22f540b12f296d844ad5bf39aaa47bfeb4.tar.gz rust-822f8c22f540b12f296d844ad5bf39aaa47bfeb4.zip | |
Auto merge of #103649 - petrochenkov:docnotrait, r=GuillaumeGomez
rustdoc: Do not add external traits to the crate in `register_res` It's not clear why it was done, and apparently it's no longer necessary now. Such additions are unpredictable for early doc link resolution and would force us to collect all doc links from all external traits. Fixes https://github.com/rust-lang/rust/issues/103463
| -rw-r--r-- | src/librustdoc/clean/utils.rs | 4 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs | 4 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/issue-103463.rs | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs index 8f3e29a31a0..518e320235f 100644 --- a/src/librustdoc/clean/utils.rs +++ b/src/librustdoc/clean/utils.rs @@ -7,7 +7,6 @@ use crate::clean::{ PathSegment, Primitive, PrimitiveType, Type, TypeBinding, Visibility, }; use crate::core::DocContext; -use crate::formats::item_type::ItemType; use rustc_ast as ast; use rustc_ast::tokenstream::TokenTree; @@ -503,9 +502,6 @@ pub(crate) fn register_res(cx: &mut DocContext<'_>, res: Res) -> DefId { return did; } inline::record_extern_fqn(cx, did, kind); - if let ItemType::Trait = kind { - inline::record_extern_trait(cx, did); - } did } diff --git a/src/test/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs b/src/test/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs new file mode 100644 index 00000000000..2b8fdec1f12 --- /dev/null +++ b/src/test/rustdoc/intra-doc/auxiliary/issue-103463-aux.rs @@ -0,0 +1,4 @@ +pub trait Trait { + /// [`u8::clone`] + fn method(); +} diff --git a/src/test/rustdoc/intra-doc/issue-103463.rs b/src/test/rustdoc/intra-doc/issue-103463.rs new file mode 100644 index 00000000000..4adf8a9a8a4 --- /dev/null +++ b/src/test/rustdoc/intra-doc/issue-103463.rs @@ -0,0 +1,8 @@ +// The `Trait` is not pulled into the crate resulting in doc links in its methods being resolved. + +// aux-build:issue-103463-aux.rs + +extern crate issue_103463_aux; +use issue_103463_aux::Trait; + +fn main() {} |
