about summary refs log tree commit diff
path: root/src/test/rustdoc-ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/rustdoc-ui')
-rw-r--r--src/test/rustdoc-ui/deprecated-attrs.rs7
-rw-r--r--src/test/rustdoc-ui/deprecated-attrs.stderr20
-rw-r--r--src/test/rustdoc-ui/issue-91713.rs2
-rw-r--r--src/test/rustdoc-ui/issue-91713.stderr3
4 files changed, 12 insertions, 20 deletions
diff --git a/src/test/rustdoc-ui/deprecated-attrs.rs b/src/test/rustdoc-ui/deprecated-attrs.rs
index 5febc5eb9cd..4f6a14fc2c2 100644
--- a/src/test/rustdoc-ui/deprecated-attrs.rs
+++ b/src/test/rustdoc-ui/deprecated-attrs.rs
@@ -1,16 +1,15 @@
 // check-pass
 // compile-flags: --passes unknown-pass
-// error-pattern: ignoring unknown pass `unknown-pass`
+// error-pattern: the `passes` flag no longer functions
 
 #![doc(no_default_passes)]
 //~^ WARNING attribute is deprecated
 //~| NOTE see issue #44136
-//~| HELP use `#![doc(document_private_items)]`
+//~| HELP no longer functions; you may want to use `#![doc(document_private_items)]`
 #![doc(passes = "collapse-docs unindent-comments")]
 //~^ WARNING attribute is deprecated
 //~| NOTE see issue #44136
-//~| WARNING ignoring unknown pass
-//~| NOTE `collapse-docs` pass was removed
+//~| HELP no longer functions; you may want to use `#![doc(document_private_items)]`
 #![doc(plugins = "xxx")]
 //~^ WARNING attribute is deprecated
 //~| NOTE see issue #44136
diff --git a/src/test/rustdoc-ui/deprecated-attrs.stderr b/src/test/rustdoc-ui/deprecated-attrs.stderr
index b855cedf522..45b20ce70ef 100644
--- a/src/test/rustdoc-ui/deprecated-attrs.stderr
+++ b/src/test/rustdoc-ui/deprecated-attrs.stderr
@@ -1,8 +1,7 @@
-warning: the `passes` flag is deprecated
+warning: the `passes` flag no longer functions
    |
    = note: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
-
-warning: ignoring unknown pass `unknown-pass`
+   = help: you may want to use --document-private-items
 
 warning: the `#![doc(no_default_passes)]` attribute is deprecated
   --> $DIR/deprecated-attrs.rs:5:8
@@ -11,7 +10,7 @@ LL | #![doc(no_default_passes)]
    |        ^^^^^^^^^^^^^^^^^
    |
    = note: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
-   = help: you may want to use `#![doc(document_private_items)]`
+   = help: `#![doc(no_default_passes)]` no longer functions; you may want to use `#![doc(document_private_items)]`
 
 warning: the `#![doc(passes = "...")]` attribute is deprecated
   --> $DIR/deprecated-attrs.rs:9:8
@@ -20,17 +19,10 @@ LL | #![doc(passes = "collapse-docs unindent-comments")]
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
-
-warning: ignoring unknown pass `collapse-docs`
-  --> $DIR/deprecated-attrs.rs:9:17
-   |
-LL | #![doc(passes = "collapse-docs unindent-comments")]
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the `collapse-docs` pass was removed in #80261 <https://github.com/rust-lang/rust/pull/80261>
+   = help: `#![doc(passes = "...")]` no longer functions; you may want to use `#![doc(document_private_items)]`
 
 warning: the `#![doc(plugins = "...")]` attribute is deprecated
-  --> $DIR/deprecated-attrs.rs:14:8
+  --> $DIR/deprecated-attrs.rs:13:8
    |
 LL | #![doc(plugins = "xxx")]
    |        ^^^^^^^^^^^^^^^
@@ -38,5 +30,5 @@ LL | #![doc(plugins = "xxx")]
    = note: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
    = warning: `#![doc(plugins = "...")]` no longer functions; see CVE-2018-1000622 <https://nvd.nist.gov/vuln/detail/CVE-2018-1000622>
 
-warning: 5 warnings emitted
+warning: 3 warnings emitted
 
diff --git a/src/test/rustdoc-ui/issue-91713.rs b/src/test/rustdoc-ui/issue-91713.rs
index b7057d868c2..610bbf11d9c 100644
--- a/src/test/rustdoc-ui/issue-91713.rs
+++ b/src/test/rustdoc-ui/issue-91713.rs
@@ -1,3 +1,3 @@
 // check-pass
 // compile-flags: --passes list
-// error-pattern: the `passes` flag is deprecated
+// error-pattern: the `passes` flag no longer functions
diff --git a/src/test/rustdoc-ui/issue-91713.stderr b/src/test/rustdoc-ui/issue-91713.stderr
index 70c22b3c01e..44ead7a1de2 100644
--- a/src/test/rustdoc-ui/issue-91713.stderr
+++ b/src/test/rustdoc-ui/issue-91713.stderr
@@ -1,4 +1,5 @@
-warning: the `passes` flag is deprecated
+warning: the `passes` flag no longer functions
    |
    = note: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
+   = help: you may want to use --document-private-items