Also use INVALID_DOC_ATTRIBUTE for "unknown doc attribute" warnings

GuillaumeGomez · GuillaumeGomez · commit 55cec9079deb · 2021-03-04T21:48:07.000+01:00
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs
@@ -585,19 +585,14 @@ impl CheckAttrVisitor<'tcx> {
                         .any(|m| i_meta.has_name(*m))
                         {
                             self.tcx.struct_span_lint_hir(
-                                UNUSED_ATTRIBUTES,
+                                INVALID_DOC_ATTRIBUTE,
                                 hir_id,
                                 i_meta.span,
                                 |lint| {
                                     lint.build(&format!(
                                         "unknown `doc` attribute `{}`",
                                         i_meta.name_or_empty()
                                     ))
-                                    .warn(
-                                        "this was previously accepted by the compiler but is \
-                                        being phased out; it will become a hard error in \
-                                        a future release!",
-                                    )
                                     .emit();
                                 },
                             );
diff --git a/src/test/rustdoc-ui/doc-attr.rs b/src/test/rustdoc-ui/doc-attr.rs
@@ -1,11 +1,10 @@
 #![crate_type = "lib"]
-#![deny(unused_attributes)]
-//~^ NOTE lint level is defined here
+#![deny(warnings)]
 #![doc(as_ptr)]
 //~^ ERROR unknown `doc` attribute
-//~| WARNING will become a hard error in a future release
+//~^^ WARN
 
 #[doc(as_ptr)]
 //~^ ERROR unknown `doc` attribute
-//~| WARNING will become a hard error in a future release
+//~^^ WARN
 pub fn foo() {}
diff --git a/src/test/rustdoc-ui/doc-attr.stderr b/src/test/rustdoc-ui/doc-attr.stderr
@@ -1,23 +1,26 @@
 error: unknown `doc` attribute `as_ptr`
-  --> $DIR/doc-attr.rs:8:7
+  --> $DIR/doc-attr.rs:7:7
    |
 LL | #[doc(as_ptr)]
    |       ^^^^^^
    |
 note: the lint level is defined here
   --> $DIR/doc-attr.rs:2:9
    |
-LL | #![deny(unused_attributes)]
-   |         ^^^^^^^^^^^^^^^^^
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(invalid_doc_attribute)]` implied by `#[deny(warnings)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>
 
 error: unknown `doc` attribute `as_ptr`
-  --> $DIR/doc-attr.rs:4:8
+  --> $DIR/doc-attr.rs:3: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!
+   = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/attributes/doc-attr.rs b/src/test/ui/attributes/doc-attr.rs
@@ -1,11 +1,10 @@
 #![crate_type = "lib"]
-#![deny(unused_attributes)]
-//~^ NOTE lint level is defined here
+#![deny(warnings)]
 #![doc(as_ptr)]
 //~^ ERROR unknown `doc` attribute
-//~| WARNING will become a hard error in a future release
+//~^^ WARN
 
 #[doc(as_ptr)]
 //~^ ERROR unknown `doc` attribute
-//~| WARNING will become a hard error in a future release
+//~^^ WARN
 pub fn foo() {}
diff --git a/src/test/ui/attributes/doc-attr.stderr b/src/test/ui/attributes/doc-attr.stderr
@@ -1,23 +1,26 @@
 error: unknown `doc` attribute `as_ptr`
-  --> $DIR/doc-attr.rs:8:7
+  --> $DIR/doc-attr.rs:7:7
    |
 LL | #[doc(as_ptr)]
    |       ^^^^^^
    |
 note: the lint level is defined here
   --> $DIR/doc-attr.rs:2:9
    |
-LL | #![deny(unused_attributes)]
-   |         ^^^^^^^^^^^^^^^^^
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(invalid_doc_attribute)]` implied by `#[deny(warnings)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>
 
 error: unknown `doc` attribute `as_ptr`
-  --> $DIR/doc-attr.rs:4:8
+  --> $DIR/doc-attr.rs:3: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!
+   = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>
 
 error: aborting due to 2 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,26 @@`
`1`	`1`	error: unknown `doc` attribute `as_ptr`
`2`		`- --> $DIR/doc-attr.rs:8:7`
	`2`	`+ --> $DIR/doc-attr.rs:7:7`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[doc(as_ptr)]`
`5`	`5`	`\| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	`note: the lint level is defined here`
`8`	`8`	`--> $DIR/doc-attr.rs:2:9`
`9`	`9`	`\|`
`10`		`-LL \| #![deny(unused_attributes)]`
`11`		`- \| ^^^^^^^^^^^^^^^^^`
	`10`	`+LL \| #![deny(warnings)]`
	`11`	`+ \| ^^^^^^^^`
	`12`	+ = note: `#[deny(invalid_doc_attribute)]` implied by `#[deny(warnings)]`
`12`	`13`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
	`14`	`+ = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>`
`13`	`15`
`14`	`16`	error: unknown `doc` attribute `as_ptr`
`15`		`- --> $DIR/doc-attr.rs:4:8`
	`17`	`+ --> $DIR/doc-attr.rs:3:8`
`16`	`18`	`\|`
`17`	`19`	`LL \| #![doc(as_ptr)]`
`18`	`20`	`\| ^^^^^^`
`19`	`21`	`\|`
`20`	`22`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
	`23`	`+ = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>`
`21`	`24`
`22`	`25`	`error: aborting due to 2 previous errors`
`23`	`26`