Skip to content

Commit 3dc8544

Browse files
Update code to new invalid_codeblock_attributes lint name
1 parent d70e6e1 commit 3dc8544

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/bootstrap/builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ impl<'a> Builder<'a> {
726726
.env("RUSTDOC_REAL", self.rustdoc(compiler))
727727
.env("RUSTDOC_CRATE_VERSION", self.rust_version())
728728
.env("RUSTC_BOOTSTRAP", "1")
729-
.arg("-Dinvalid_codeblock_attribute");
729+
.arg("-Dinvalid_codeblock_attributes");
730730
if self.config.deny_warnings {
731731
cmd.arg("-Dwarnings");
732732
}
@@ -1162,7 +1162,7 @@ impl<'a> Builder<'a> {
11621162
// fixed via better support from Cargo.
11631163
cargo.env("RUSTC_LINT_FLAGS", lint_flags.join(" "));
11641164

1165-
rustdocflags.arg("-Dinvalid_codeblock_attribute");
1165+
rustdocflags.arg("-Dinvalid_codeblock_attributes");
11661166
}
11671167

11681168
if let Mode::Rustc | Mode::Codegen = mode {

src/librustdoc/core.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
315315
let missing_doc_example = rustc_lint::builtin::MISSING_DOC_CODE_EXAMPLES.name;
316316
let private_doc_tests = rustc_lint::builtin::PRIVATE_DOC_TESTS.name;
317317
let no_crate_level_docs = rustc_lint::builtin::MISSING_CRATE_LEVEL_DOCS.name;
318-
let invalid_codeblock_attribute_name = rustc_lint::builtin::INVALID_CODEBLOCK_ATTRIBUTES.name;
318+
let invalid_codeblock_attributes_name = rustc_lint::builtin::INVALID_CODEBLOCK_ATTRIBUTES.name;
319319

320320
// In addition to those specific lints, we also need to allow those given through
321321
// command line, otherwise they'll get ignored and we don't want that.
@@ -325,12 +325,12 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
325325
missing_doc_example.to_owned(),
326326
private_doc_tests.to_owned(),
327327
no_crate_level_docs.to_owned(),
328-
invalid_codeblock_attribute_name.to_owned(),
328+
invalid_codeblock_attributes_name.to_owned(),
329329
];
330330

331331
let (lint_opts, lint_caps) = init_lints(allowed_lints, lint_opts, |lint| {
332332
if lint.name == intra_link_resolution_failure_name
333-
|| lint.name == invalid_codeblock_attribute_name
333+
|| lint.name == invalid_codeblock_attributes_name
334334
{
335335
None
336336
} else {

src/librustdoc/test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ pub struct TestOptions {
4545
pub fn run(options: Options) -> Result<(), String> {
4646
let input = config::Input::File(options.input.clone());
4747

48-
let invalid_codeblock_attribute_name = rustc_lint::builtin::INVALID_CODEBLOCK_ATTRIBUTES.name;
48+
let invalid_codeblock_attributes_name = rustc_lint::builtin::INVALID_CODEBLOCK_ATTRIBUTES.name;
4949

5050
// In addition to those specific lints, we also need to allow those given through
5151
// command line, otherwise they'll get ignored and we don't want that.
52-
let allowed_lints = vec![invalid_codeblock_attribute_name.to_owned()];
52+
let allowed_lints = vec![invalid_codeblock_attributes_name.to_owned()];
5353

5454
let (lint_opts, lint_caps) = init_lints(allowed_lints, options.lint_opts.clone(), |lint| {
55-
if lint.name == invalid_codeblock_attribute_name {
55+
if lint.name == invalid_codeblock_attributes_name {
5656
None
5757
} else {
5858
Some((lint.name_lower(), lint::Allow))

0 commit comments

Comments
 (0)