about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-11-02 22:06:28 +0100
committerGitHub <noreply@github.com>2022-11-02 22:06:28 +0100
commit88f9f49b47cea22a28d91932ed5d3100d127512e (patch)
treea2fbb265fa0ccf6e2df6eb211690f184d2ec006d /src/test
parentbb201b5d95571ff4dd93533463f858c1b3c69d40 (diff)
parentc983bb162c932acc4854c6288104e03280a17983 (diff)
Rollup merge of #103886 - GuillaumeGomez:local-reexport-doc, r=notriddle
rustdoc: Fix merge of attributes for reexports of local items

Fixes https://github.com/rust-lang/rust/issues/84619.

The problem was that we didn't merge attributes between the the reexport and the item.

r? `@notriddle`
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc/local-reexport-doc.rs16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/test/rustdoc/local-reexport-doc.rs b/src/test/rustdoc/local-reexport-doc.rs
new file mode 100644
index 00000000000..1c8468008dd
--- /dev/null
+++ b/src/test/rustdoc/local-reexport-doc.rs
@@ -0,0 +1,16 @@
+// This test ensures that the reexports of local items also get the doc from
+// the reexport.
+
+#![crate_name = "foo"]
+
+// @has 'foo/fn.g.html'
+// @has - '//*[@class="rustdoc-toggle top-doc"]/*[@class="docblock"]' \
+// 'outer module inner module'
+
+mod inner_mod {
+    /// inner module
+    pub fn g() {}
+}
+
+/// outer module
+pub use inner_mod::g;