about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-02-27 13:32:18 +0100
committerGitHub <noreply@github.com>2019-02-27 13:32:18 +0100
commitf6673a4e7ccfd5f5c8de07e24735b1e730aaffb2 (patch)
tree017123984059d5d0ffa88f2f51246a3c7acaeddd /src/test
parent2f58c2cfc0ca7b10ebf89defeaef3417eb800110 (diff)
parent1536852b428b56a13a3026354db72e0b83c83652 (diff)
downloadrust-f6673a4e7ccfd5f5c8de07e24735b1e730aaffb2.tar.gz
rust-f6673a4e7ccfd5f5c8de07e24735b1e730aaffb2.zip
Rollup merge of #58627 - euclio:rustdoc-pass-order, r=QuietMisdreavus
rustdoc: move collapse and unindent docs passes earlier

Moves these passes as early as possible so later passes will see the same markdown that is passed to the test collector.

Fixes #58473, and a similar issue with the private-doc-tests lint.

r? @QuietMisdreavus
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc-ui/intra-links-warning.stderr4
-rw-r--r--src/test/rustdoc-ui/issue-58473-2.rs12
-rw-r--r--src/test/rustdoc-ui/issue-58473.rs10
3 files changed, 24 insertions, 2 deletions
diff --git a/src/test/rustdoc-ui/intra-links-warning.stderr b/src/test/rustdoc-ui/intra-links-warning.stderr
index e5409c04205..60fc131dbda 100644
--- a/src/test/rustdoc-ui/intra-links-warning.stderr
+++ b/src/test/rustdoc-ui/intra-links-warning.stderr
@@ -105,8 +105,8 @@ LL | | /// [error]
    |
    = note: the link appears in this line:
            
-            [error]
-             ^^^^^
+           [error]
+            ^^^^^
    = help: to escape `[` and `]` characters, just add '/' before them like `/[` or `/]`
 
 warning: `[error1]` cannot be resolved, ignoring it...
diff --git a/src/test/rustdoc-ui/issue-58473-2.rs b/src/test/rustdoc-ui/issue-58473-2.rs
new file mode 100644
index 00000000000..5e5ddebe108
--- /dev/null
+++ b/src/test/rustdoc-ui/issue-58473-2.rs
@@ -0,0 +1,12 @@
+// compile-pass
+
+#![deny(private_doc_tests)]
+
+mod foo {
+    /**
+    Does nothing, returns `()`
+
+    yadda-yadda-yadda
+    */
+    fn foo() {}
+}
diff --git a/src/test/rustdoc-ui/issue-58473.rs b/src/test/rustdoc-ui/issue-58473.rs
new file mode 100644
index 00000000000..0e5be3292c0
--- /dev/null
+++ b/src/test/rustdoc-ui/issue-58473.rs
@@ -0,0 +1,10 @@
+// compile-pass
+
+pub trait Foo {
+    /**
+    Does nothing, returns `()`
+
+    yadda-yadda-yadda
+    */
+    fn foo() {}
+}