about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-04-07 15:33:22 +0000
committerbors <bors@rust-lang.org>2022-04-07 15:33:22 +0000
commitdd38eea722c1f6f970a314435533e91cc2c14ffb (patch)
treec2bb42ec39969e2041f87cf398ba5f5815a7ff03 /src/test
parentfa723160318fac5f3fa6f4141cfc41c0606a3008 (diff)
parent69d6c3b2e6daa58e24ccec31961fe9d59fa332bb (diff)
downloadrust-dd38eea722c1f6f970a314435533e91cc2c14ffb.tar.gz
rust-dd38eea722c1f6f970a314435533e91cc2c14ffb.zip
Auto merge of #95706 - petrochenkov:doclink4, r=GuillaumeGomez
rustdoc: Early doc link resolution fixes and refactorings

A subset of https://github.com/rust-lang/rust/pull/94857 that shouldn't cause perf regressions, but should fix some issues like https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/ICE.20in.20collect_intra_doc_links.2Ers https://github.com/rust-lang/rust/pull/95290 and improve performance in cases like https://github.com/rust-lang/rust/issues/95694.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs19
-rw-r--r--src/test/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs11
2 files changed, 30 insertions, 0 deletions
diff --git a/src/test/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs b/src/test/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs
new file mode 100644
index 00000000000..b4ce3443ccd
--- /dev/null
+++ b/src/test/rustdoc-ui/intra-doc/assoc-mod-inner-outer.rs
@@ -0,0 +1,19 @@
+// Traits in scope are collected for doc links in both outer and inner module attributes.
+
+// check-pass
+// aux-build: assoc-mod-inner-outer-dep.rs
+
+extern crate assoc_mod_inner_outer_dep;
+pub use assoc_mod_inner_outer_dep::*;
+
+#[derive(Clone)]
+pub struct Struct;
+
+pub mod outer1 {
+    /// [crate::Struct::clone]
+    pub mod inner {}
+}
+
+pub mod outer2 {
+    //! [crate::Struct::clone]
+}
diff --git a/src/test/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs b/src/test/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs
new file mode 100644
index 00000000000..7a11a165723
--- /dev/null
+++ b/src/test/rustdoc-ui/intra-doc/auxiliary/assoc-mod-inner-outer-dep.rs
@@ -0,0 +1,11 @@
+#[derive(Clone)]
+pub struct Struct;
+
+pub mod dep_outer1 {
+    /// [crate::Struct::clone]
+    pub mod inner {}
+}
+
+pub mod dep_outer2 {
+    //! [crate::Struct::clone]
+}