Make invalid_doc_attribute lint plural

rust-lang · Mar 5, 2021 · a11e87e · a11e87e
1 parent 55cec90
commit a11e87e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
@@ -3061,7 +3061,7 @@ declare_lint! {
 }
 
 declare_lint! {
-    /// The `invalid_doc_attribute` lint detects when the `#[doc(...)]` is
+    /// The `invalid_doc_attributes` lint detects when the `#[doc(...)]` is
     /// misused.
     ///
     /// ### Example
@@ -3081,7 +3081,7 @@ declare_lint! {
     /// Previously, there were very like checks being performed on `#[doc(..)]`
     /// unlike the other attributes. It'll now catch all the issues that it
     /// silently ignored previously.
-    pub INVALID_DOC_ATTRIBUTE,
+    pub INVALID_DOC_ATTRIBUTES,
     Warn,
     "detects invalid `#[doc(...)]` attributes",
     @future_incompatible = FutureIncompatibleInfo {

diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs
@@ -18,7 +18,7 @@ use rustc_hir::{
 };
 use rustc_hir::{MethodKind, Target};
 use rustc_session::lint::builtin::{
-    CONFLICTING_REPR_HINTS, INVALID_DOC_ATTRIBUTE, UNUSED_ATTRIBUTES,
+    CONFLICTING_REPR_HINTS, INVALID_DOC_ATTRIBUTES, UNUSED_ATTRIBUTES,
 };
 use rustc_session::parse::feature_err;
 use rustc_span::symbol::{sym, Symbol};
@@ -549,7 +549,7 @@ impl CheckAttrVisitor<'tcx> {
                     } else if meta.has_name(sym::test) {
                         if CRATE_HIR_ID != hir_id {
                             self.tcx.struct_span_lint_hir(
-                                INVALID_DOC_ATTRIBUTE,
+                                INVALID_DOC_ATTRIBUTES,
                                 hir_id,
                                 meta.span(),
                                 |lint| {
@@ -585,7 +585,7 @@ impl CheckAttrVisitor<'tcx> {
                         .any(|m| i_meta.has_name(*m))
                         {
                             self.tcx.struct_span_lint_hir(
-                                INVALID_DOC_ATTRIBUTE,
+                                INVALID_DOC_ATTRIBUTES,
                                 hir_id,
                                 i_meta.span,
                                 |lint| {

diff --git a/src/test/rustdoc-ui/doc-attr.stderr b/src/test/rustdoc-ui/doc-attr.stderr
@@ -9,7 +9,7 @@ note: the lint level is defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: `#[deny(invalid_doc_attribute)]` implied by `#[deny(warnings)]`
+   = note: `#[deny(invalid_doc_attributes)]` 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>
 

diff --git a/src/test/rustdoc-ui/doc-attr2.stderr b/src/test/rustdoc-ui/doc-attr2.stderr
@@ -9,7 +9,7 @@ note: the lint level is defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: `#[deny(invalid_doc_attribute)]` implied by `#[deny(warnings)]`
+   = note: `#[deny(invalid_doc_attributes)]` 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>
 

diff --git a/src/test/ui/attributes/doc-attr.stderr b/src/test/ui/attributes/doc-attr.stderr
@@ -9,7 +9,7 @@ note: the lint level is defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: `#[deny(invalid_doc_attribute)]` implied by `#[deny(warnings)]`
+   = note: `#[deny(invalid_doc_attributes)]` 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>
 

diff --git a/src/test/ui/attributes/doc-attr2.stderr b/src/test/ui/attributes/doc-attr2.stderr
@@ -9,7 +9,7 @@ note: the lint level is defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: `#[deny(invalid_doc_attribute)]` implied by `#[deny(warnings)]`
+   = note: `#[deny(invalid_doc_attributes)]` 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>