Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 59 insertions, 0 deletions

diff --git a/tests/rustdoc-ui/intra-doc/prim-conflict.stderr b/tests/rustdoc-ui/intra-doc/prim-conflict.stderr
new file mode 100644
index 000000000..6ef3b7eab
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/prim-conflict.stderr
@@ -0,0 +1,59 @@
+error: `char` is both a module and a builtin type
+  --> $DIR/prim-conflict.rs:4:6
+   |
+LL | /// [char]
+   |      ^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/prim-conflict.rs:1:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the module, prefix with `mod@`
+   |
+LL | /// [mod@char]
+   |      ++++
+help: to link to the builtin type, prefix with `prim@`
+   |
+LL | /// [prim@char]
+   |      +++++
+
+error: `char` is both a module and a builtin type
+  --> $DIR/prim-conflict.rs:10:6
+   |
+LL | /// [type@char]
+   |      ^^^^^^^^^ ambiguous link
+   |
+help: to link to the module, prefix with `mod@`
+   |
+LL | /// [mod@char]
+   |      ~~~~
+help: to link to the builtin type, prefix with `prim@`
+   |
+LL | /// [prim@char]
+   |      ~~~~~
+
+error: incompatible link kind for `char`
+  --> $DIR/prim-conflict.rs:19:6
+   |
+LL | /// [struct@char]
+   |      ^^^^^^^^^^^ this link resolved to a module, which is not a struct
+   |
+help: to link to the module, prefix with `mod@`
+   |
+LL | /// [mod@char]
+   |      ~~~~
+
+error: incompatible link kind for `char`
+  --> $DIR/prim-conflict.rs:26:10
+   |
+LL |     //! [struct@char]
+   |          ^^^^^^^^^^^ this link resolved to a builtin type, which is not a struct
+   |
+help: to link to the builtin type, prefix with `prim@`
+   |
+LL |     //! [prim@char]
+   |          ~~~~~
+
+error: aborting due to 4 previous errors
+