about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorJonas Schievink <jonasschievink@gmail.com>2020-11-24 13:17:39 +0100
committerGitHub <noreply@github.com>2020-11-24 13:17:39 +0100
commit3f36f92a96d4b1d9b685d23b71bb77ebbe64a08a (patch)
treed00085615d61a715cbb3422ffdb04ba536988488 /src/test
parent5a66a73282a17a4778fa419cb59ee5aa74e37ea2 (diff)
parent0b6537a9ea50b294ae0b371ac4b6757303bb19f8 (diff)
downloadrust-3f36f92a96d4b1d9b685d23b71bb77ebbe64a08a.tar.gz
rust-3f36f92a96d4b1d9b685d23b71bb77ebbe64a08a.zip
Rollup merge of #79321 - camelid:intra-doc-bang, r=Manishearth
Accept '!' in intra-doc links

This will allow linking to things like `Result<T, !>`.

*See <https://github.com/rust-lang/rust/pull/77832#discussion_r528409079>.*

r? ``@jyn514``
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc/intra-doc-link-generic-params.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/rustdoc/intra-doc-link-generic-params.rs b/src/test/rustdoc/intra-doc-link-generic-params.rs
index 7d7289437ff..1de6410f10c 100644
--- a/src/test/rustdoc/intra-doc-link-generic-params.rs
+++ b/src/test/rustdoc/intra-doc-link-generic-params.rs
@@ -15,8 +15,11 @@
 // @has foo/index.html '//a[@href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html"]' 'with the generic, Option<T>'
 
 //! We should also try linking to [`Result<T, E>`]; it has *two* generics!
+//! And [`Result<T, !>`] and [`Result<!, E>`].
 //!
 // @has foo/index.html '//a[@href="https://doc.rust-lang.org/nightly/core/result/enum.Result.html"]' 'Result<T, E>'
+// @has foo/index.html '//a[@href="https://doc.rust-lang.org/nightly/core/result/enum.Result.html"]' 'Result<T, !>'
+// @has foo/index.html '//a[@href="https://doc.rust-lang.org/nightly/core/result/enum.Result.html"]' 'Result<!, E>'
 
 //! Now let's test a trickier case: [`Vec::<T>::new`], or you could write it
 //! [with parentheses as `Vec::<T>::new()`][Vec::<T>::new()].