diff options
| author | bors <bors@rust-lang.org> | 2020-10-05 02:49:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-05 02:49:51 +0000 |
| commit | efbaa413061c2a6e52f06f00a60ee7830fcf3ea5 (patch) | |
| tree | d728ec6e5c6bbcaaf0accc89b53a176515718745 /src/test/rustdoc-ui | |
| parent | ced813fec0fb9e883906f18b76d618baf9f5bc08 (diff) | |
| parent | 9dbc9ed870a3956d938c823338ac8943377845e8 (diff) | |
| download | rust-efbaa413061c2a6e52f06f00a60ee7830fcf3ea5.tar.gz rust-efbaa413061c2a6e52f06f00a60ee7830fcf3ea5.zip | |
Auto merge of #77557 - Dylan-DPC:rollup-aib9ptp, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #75853 (Use more intra-doc-links in `core::fmt`) - #75928 (Remove trait_selection error message in specific case) - #76329 (Add check for doc alias attribute at crate level) - #77219 (core::global_allocator docs link to std::alloc::GlobalAlloc) - #77395 (BTreeMap: admit the existence of leaf edges in comments) - #77407 (Improve build-manifest to work with the improved promote-release) - #77426 (Include scope id in SocketAddrV6::Display) - #77439 (Fix missing diagnostic span for `impl Trait` with const generics, and add various tests for `min_const_generics` and `const_generics`) - #77471 (BTreeMap: refactoring around edges, missed spots) - #77512 (Allow `Abort` terminators in all const-contexts) - #77514 (Replace some once(x).chain(once(y)) with [x, y] IntoIter) Failed merges: r? `@ghost`
Diffstat (limited to 'src/test/rustdoc-ui')
| -rw-r--r-- | src/test/rustdoc-ui/doc-alias-crate-level.rs | 6 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/doc-alias-crate-level.stderr | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/test/rustdoc-ui/doc-alias-crate-level.rs b/src/test/rustdoc-ui/doc-alias-crate-level.rs new file mode 100644 index 00000000000..309d0bc4d43 --- /dev/null +++ b/src/test/rustdoc-ui/doc-alias-crate-level.rs @@ -0,0 +1,6 @@ +#![feature(doc_alias)] + +#![doc(alias = "crate-level-not-working")] //~ ERROR + +#[doc(alias = "shouldn't work!")] //~ ERROR +pub fn foo() {} diff --git a/src/test/rustdoc-ui/doc-alias-crate-level.stderr b/src/test/rustdoc-ui/doc-alias-crate-level.stderr new file mode 100644 index 00000000000..fc14266cd71 --- /dev/null +++ b/src/test/rustdoc-ui/doc-alias-crate-level.stderr @@ -0,0 +1,14 @@ +error: '\'' character isn't allowed in `#[doc(alias = "...")]` + --> $DIR/doc-alias-crate-level.rs:5:7 + | +LL | #[doc(alias = "shouldn't work!")] + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + +error: `#![doc(alias = "...")]` isn't allowed as a crate level attribute + --> $DIR/doc-alias-crate-level.rs:3:8 + | +LL | #![doc(alias = "crate-level-not-working")] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to 2 previous errors + |