]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #74131 - ollie27:rustdoc_invalid_codeblock_attributes_name, r=Guillaume...
authorbors <bors@rust-lang.org>
Thu, 9 Jul 2020 07:00:27 +0000 (07:00 +0000)
committerbors <bors@rust-lang.org>
Thu, 9 Jul 2020 07:00:27 +0000 (07:00 +0000)
rustdoc: Rename invalid_codeblock_attribute lint to be plural

Lint names should be plural as per the lint naming conventions: https://github.com/rust-lang/rfcs/blob/master/text/0344-conventions-galore.md#lints

r? @GuillaumeGomez

1  2 
src/librustc_lint/lib.rs

diff --combined src/librustc_lint/lib.rs
index 45a86cf2cc6ccf56d6ae9aa62ee884a6a43ad75e,4556c3547f7fc4759f2dbad8df3b15332a8d7346..b7610b08b87fc073830eb6ccf1aab2eb5fbc0c2c
@@@ -34,7 -34,6 +34,7 @@@
  #![feature(never_type)]
  #![feature(nll)]
  #![feature(or_patterns)]
 +#![cfg_attr(bootstrap, feature(track_caller))]
  #![recursion_limit = "256"]
  
  #[macro_use]
@@@ -63,7 -62,7 +63,7 @@@ use rustc_middle::ty::query::Providers
  use rustc_middle::ty::TyCtxt;
  use rustc_session::lint::builtin::{
      BARE_TRAIT_OBJECTS, ELIDED_LIFETIMES_IN_PATHS, EXPLICIT_OUTLIVES_REQUIREMENTS,
-     INTRA_DOC_LINK_RESOLUTION_FAILURE, INVALID_CODEBLOCK_ATTRIBUTE, MISSING_DOC_CODE_EXAMPLES,
+     INTRA_DOC_LINK_RESOLUTION_FAILURE, INVALID_CODEBLOCK_ATTRIBUTES, MISSING_DOC_CODE_EXAMPLES,
      PRIVATE_DOC_TESTS,
  };
  use rustc_span::symbol::{Ident, Symbol};
@@@ -305,7 -304,7 +305,7 @@@ fn register_builtins(store: &mut LintSt
      add_lint_group!(
          "rustdoc",
          INTRA_DOC_LINK_RESOLUTION_FAILURE,
-         INVALID_CODEBLOCK_ATTRIBUTE,
+         INVALID_CODEBLOCK_ATTRIBUTES,
          MISSING_DOC_CODE_EXAMPLES,
          PRIVATE_DOC_TESTS
      );