diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2021-08-26 12:38:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 12:38:07 -0700 |
| commit | 14fb87a4092115887346d4ee8a9278ef540680cd (patch) | |
| tree | 0923dfdd24a9f9ab1265418aa2db600619d20485 /src/test/rustdoc | |
| parent | 8aa46e51dfc20f6bc01207d67a5f666239ed8e07 (diff) | |
| parent | c60a370dac4821d0a1a4d55943e28c2da2220dc7 (diff) | |
| download | rust-14fb87a4092115887346d4ee8a9278ef540680cd.tar.gz rust-14fb87a4092115887346d4ee8a9278ef540680cd.zip | |
Rollup merge of #88215 - jyn514:lazy-loading, r=petrochenkov
Reland #83738: "rustdoc: Don't load all extern crates unconditionally" I hopefully found all the bugs :crossed_fingers: time for a take two. See the last commit for details on what went wrong before. r? `@petrochenkov` (but feel free to reassign to Guillaume if you don't have time.) Closes https://github.com/rust-lang/rust/issues/68427. Includes a fix for https://github.com/rust-lang/rust/issues/84738.
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/auxiliary/issue-66159-1.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/auxiliary/pub-struct.rs | 1 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/extern-reference-link.rs | 7 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/issue-66159.rs (renamed from src/test/rustdoc/issue-66159.rs) | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/test/rustdoc/auxiliary/issue-66159-1.rs b/src/test/rustdoc/auxiliary/issue-66159-1.rs deleted file mode 100644 index 2f3d069bd51..00000000000 --- a/src/test/rustdoc/auxiliary/issue-66159-1.rs +++ /dev/null @@ -1,2 +0,0 @@ -/// This will be referred to by the test docstring -pub struct Something; diff --git a/src/test/rustdoc/intra-doc/auxiliary/pub-struct.rs b/src/test/rustdoc/intra-doc/auxiliary/pub-struct.rs new file mode 100644 index 00000000000..75d4289321c --- /dev/null +++ b/src/test/rustdoc/intra-doc/auxiliary/pub-struct.rs @@ -0,0 +1 @@ +pub struct SomeStruct; diff --git a/src/test/rustdoc/intra-doc/extern-reference-link.rs b/src/test/rustdoc/intra-doc/extern-reference-link.rs new file mode 100644 index 00000000000..bad6ec75579 --- /dev/null +++ b/src/test/rustdoc/intra-doc/extern-reference-link.rs @@ -0,0 +1,7 @@ +// compile-flags: --extern pub_struct +// aux-build:pub-struct.rs + +/// [SomeStruct] +/// +/// [SomeStruct]: pub_struct::SomeStruct +pub fn foo() {} diff --git a/src/test/rustdoc/issue-66159.rs b/src/test/rustdoc/intra-doc/issue-66159.rs index 003d079a470..56742b39790 100644 --- a/src/test/rustdoc/issue-66159.rs +++ b/src/test/rustdoc/intra-doc/issue-66159.rs @@ -1,4 +1,4 @@ -// aux-crate:priv:issue_66159_1=issue-66159-1.rs +// aux-crate:priv:pub_struct=pub-struct.rs // compile-flags:-Z unstable-options // The issue was an ICE which meant that we never actually generated the docs @@ -7,4 +7,4 @@ // verify that the struct is linked correctly. // @has issue_66159/index.html -//! [issue_66159_1::Something] +//! [pub_struct::SomeStruct] |