summary refs log tree commit diff
path: root/src/test/rustdoc-ui
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2021-03-02 09:42:32 -0500
committerJoshua Nelson <jyn514@gmail.com>2021-03-03 10:04:36 -0500
commit4b2e4e69dfbf75222ae547659e999cee05833de9 (patch)
tree39b9f477bae0969e64c5f9719cfb5616f7ba1875 /src/test/rustdoc-ui
parentedeee915b1c52f97411e57ef6b1a8bd46548a37a (diff)
downloadrust-4b2e4e69dfbf75222ae547659e999cee05833de9.tar.gz
rust-4b2e4e69dfbf75222ae547659e999cee05833de9.zip
Change error about unknown doc attributes to a warning
This prevents breakage across the ecosystem, since the error was just
introduced recently without first having a warning period.
Diffstat (limited to 'src/test/rustdoc-ui')
-rw-r--r--src/test/rustdoc-ui/doc-attr.rs10
-rw-r--r--src/test/rustdoc-ui/doc-attr.stderr13
2 files changed, 19 insertions, 4 deletions
diff --git a/src/test/rustdoc-ui/doc-attr.rs b/src/test/rustdoc-ui/doc-attr.rs
index 37c69a214b8..3519b5707b3 100644
--- a/src/test/rustdoc-ui/doc-attr.rs
+++ b/src/test/rustdoc-ui/doc-attr.rs
@@ -1,5 +1,11 @@
 #![crate_type = "lib"]
-#![doc(as_ptr)] //~ ERROR
+#![deny(unused_attributes)]
+//~^ NOTE lint level is defined here
+#![doc(as_ptr)]
+//~^ ERROR unknown `doc` attribute
+//~| WARNING will become a hard error in a future release
 
-#[doc(as_ptr)] //~ ERROR
+#[doc(as_ptr)]
+//~^ ERROR unknown `doc` attribute
+//~| WARNING will become a hard error in a future release
 pub fn foo() {}
diff --git a/src/test/rustdoc-ui/doc-attr.stderr b/src/test/rustdoc-ui/doc-attr.stderr
index 17bc3d6a45a..9666db2b10e 100644
--- a/src/test/rustdoc-ui/doc-attr.stderr
+++ b/src/test/rustdoc-ui/doc-attr.stderr
@@ -1,14 +1,23 @@
 error: unknown `doc` attribute `as_ptr`
-  --> $DIR/doc-attr.rs:4:7
+  --> $DIR/doc-attr.rs:8:7
    |
 LL | #[doc(as_ptr)]
    |       ^^^^^^
+   |
+note: the lint level is defined here
+  --> $DIR/doc-attr.rs:2:9
+   |
+LL | #![deny(unused_attributes)]
+   |         ^^^^^^^^^^^^^^^^^
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 error: unknown `doc` attribute `as_ptr`
-  --> $DIR/doc-attr.rs:2:8
+  --> $DIR/doc-attr.rs:4:8
    |
 LL | #![doc(as_ptr)]
    |        ^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 error: aborting due to 2 previous errors