diff options
| author | bors <bors@rust-lang.org> | 2021-04-12 00:38:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-12 00:38:20 +0000 |
| commit | e41f378f825488a537b024fc3ed599d9c12fda96 (patch) | |
| tree | b9d939abd2fa4e173de4c8d45d02e7c8d3033a52 /src/test/rustdoc | |
| parent | 3f8added7003120582953d4f3f43991fb3bb2798 (diff) | |
| parent | 1ff117e987be82e9cff59350fd1810ebe21f8b26 (diff) | |
| download | rust-e41f378f825488a537b024fc3ed599d9c12fda96.tar.gz rust-e41f378f825488a537b024fc3ed599d9c12fda96.zip | |
Auto merge of #84112 - Dylan-DPC:rollup-tapsrzz, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #83669 (Issue 81508 fix) - #84014 (Improve trait/impl method discrepancy errors) - #84059 (Bump libc dependency of std to 0.2.93) - #84067 (clean up example on read_to_string) - #84079 (Improve test for `rustdoc::bare_urls` lint) - #84094 (Remove FixedSizeArray) - #84101 (rustdoc: Move crate loader to collect_intra_doc_links::early ) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/intra-doc/auxiliary/empty.rs | 1 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/auxiliary/empty2.rs | 1 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/extern-crate-only-used-in-link.rs | 13 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/test/rustdoc/intra-doc/auxiliary/empty.rs b/src/test/rustdoc/intra-doc/auxiliary/empty.rs new file mode 100644 index 00000000000..d11c69f812a --- /dev/null +++ b/src/test/rustdoc/intra-doc/auxiliary/empty.rs @@ -0,0 +1 @@ +// intentionally empty diff --git a/src/test/rustdoc/intra-doc/auxiliary/empty2.rs b/src/test/rustdoc/intra-doc/auxiliary/empty2.rs new file mode 100644 index 00000000000..d11c69f812a --- /dev/null +++ b/src/test/rustdoc/intra-doc/auxiliary/empty2.rs @@ -0,0 +1 @@ +// intentionally empty diff --git a/src/test/rustdoc/intra-doc/extern-crate-only-used-in-link.rs b/src/test/rustdoc/intra-doc/extern-crate-only-used-in-link.rs index 0964c79de06..5d8dcf8bc1d 100644 --- a/src/test/rustdoc/intra-doc/extern-crate-only-used-in-link.rs +++ b/src/test/rustdoc/intra-doc/extern-crate-only-used-in-link.rs @@ -1,8 +1,19 @@ +// This test is just a little cursed. // aux-build:issue-66159-1.rs // aux-crate:priv:issue_66159_1=issue-66159-1.rs +// aux-build:empty.rs +// aux-crate:priv:empty=empty.rs +// aux-build:empty2.rs +// aux-crate:priv:empty2=empty2.rs // build-aux-docs -// compile-flags:-Z unstable-options +// compile-flags:-Z unstable-options --edition 2018 // @has extern_crate_only_used_in_link/index.html // @has - '//a[@href="../issue_66159_1/struct.Something.html"]' 'issue_66159_1::Something' //! [issue_66159_1::Something] + +// @has - '//a[@href="../empty/index.html"]' 'empty' +//! [`empty`] + +// @has - '//a[@href="../empty2/index.html"]' 'empty2' +//! [empty2<x>] |