about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-12-17 00:45:53 +0100
committerGitHub <noreply@github.com>2022-12-17 00:45:53 +0100
commit11de52a46dd9b2f6e2d2797d60dfc977e8b6bcea (patch)
treee069476f6072ad903c1a5c14b335c7e822e31b02 /src/test
parent81c11892a9228db4ff78773a5a45e0effa2a51e2 (diff)
parent80059e1b7274fc7ba8d9201ea075fd1c7b7608f1 (diff)
downloadrust-11de52a46dd9b2f6e2d2797d60dfc977e8b6bcea.tar.gz
rust-11de52a46dd9b2f6e2d2797d60dfc977e8b6bcea.zip
Rollup merge of #105780 - GuillaumeGomez:read-more-links, r=notriddle
rustdoc: Don't add "Read more" link if there is no extra content

Fixes #105677.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc/read-more-unneeded.rs34
-rw-r--r--src/test/rustdoc/trait-impl.rs2
2 files changed, 34 insertions, 2 deletions
diff --git a/src/test/rustdoc/read-more-unneeded.rs b/src/test/rustdoc/read-more-unneeded.rs
new file mode 100644
index 00000000000..0303e444261
--- /dev/null
+++ b/src/test/rustdoc/read-more-unneeded.rs
@@ -0,0 +1,34 @@
+// Regression test for https://github.com/rust-lang/rust/issues/105677.
+// This test ensures that the "Read more" link is only generated when
+// there is actually more documentation to read after the short summary.
+
+#![crate_name = "foo"]
+
+pub trait MyFrom {
+    /// # Hello
+    /// ## Yolo
+    /// more!
+    fn try_from1();
+    /// a
+    /// b
+    /// c
+    fn try_from2();
+    /// a
+    ///
+    /// b
+    ///
+    /// c
+    fn try_from3();
+}
+
+pub struct NonZero;
+
+// @has 'foo/struct.NonZero.html'
+impl MyFrom for NonZero {
+    // @matches - '//*[@class="docblock"]' '^Hello Read more$'
+    fn try_from1() {}
+    // @matches - '//*[@class="docblock"]' '^a\sb\sc$'
+    fn try_from2() {}
+    // @matches - '//*[@class="docblock"]' '^a Read more$'
+    fn try_from3() {}
+}
diff --git a/src/test/rustdoc/trait-impl.rs b/src/test/rustdoc/trait-impl.rs
index 195cdf009b9..9cf3226f738 100644
--- a/src/test/rustdoc/trait-impl.rs
+++ b/src/test/rustdoc/trait-impl.rs
@@ -30,8 +30,6 @@ impl Trait for Struct {
     // @has - '//*[@id="method.b"]/../../div[@class="docblock"]' 'These docs contain'
     // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a' 'reference link'
     // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a/@href' 'https://example.com'
-    // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a' 'Read more'
-    // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/a/@href' 'trait.Trait.html#tymethod.b'
     fn b() {}
 
     // @!has - '//*[@id="method.c"]/../../div[@class="docblock"]' 'code block'