diff --git a/compiler/rustc_passes/messages.ftl b/compiler/rustc_passes/messages.ftl index afd08319738df..bba9526048a29 100644 --- a/compiler/rustc_passes/messages.ftl +++ b/compiler/rustc_passes/messages.ftl @@ -226,7 +226,6 @@ passes_doc_test_unknown_passes = unknown `doc` attribute `{$path}` .note = `doc` attribute `{$path}` no longer functions; see issue #44136 .label = no longer functions - .help = you may want to use `doc(document_private_items)` .no_op_note = `doc({$path})` is now a no-op passes_doc_test_unknown_plugins = diff --git a/compiler/rustc_passes/src/errors.rs b/compiler/rustc_passes/src/errors.rs index 23dcabef1a177..79cc24a51ee11 100644 --- a/compiler/rustc_passes/src/errors.rs +++ b/compiler/rustc_passes/src/errors.rs @@ -331,7 +331,6 @@ pub(crate) struct DocTestUnknownSpotlight { #[derive(LintDiagnostic)] #[diag(passes_doc_test_unknown_passes)] #[note] -#[help] #[note(passes_no_op_note)] pub(crate) struct DocTestUnknownPasses { pub path: String, diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index e5108d8b7e921..6b7d17e0daa7a 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -883,7 +883,6 @@ symbols! { doc_primitive, doc_spotlight, doctest, - document_private_items, dotdot: "..", dotdot_in_tuple_patterns, dotdoteq_in_patterns, diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index b8aaafcb517a9..86eb0cf8eac85 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -413,14 +413,6 @@ pub(crate) fn run_global_ctxt( ); } - // Process all of the crate attributes, extracting plugin metadata along - // with the passes which we are supposed to run. - for attr in krate.module.attrs.lists(sym::doc) { - if attr.is_word() && attr.has_name(sym::document_private_items) { - ctxt.render_options.document_private = true; - } - } - info!("Executing passes"); let mut visited = FxHashMap::default(); diff --git a/tests/rustdoc-ui/deprecated-attrs.rs b/tests/rustdoc-ui/deprecated-attrs.rs index dcf8a52de41d8..26aaf0d46808f 100644 --- a/tests/rustdoc-ui/deprecated-attrs.rs +++ b/tests/rustdoc-ui/deprecated-attrs.rs @@ -4,14 +4,12 @@ //~^ ERROR unknown `doc` attribute `no_default_passes` //~| NOTE no longer functions //~| NOTE see issue #44136 -//~| HELP you may want to use `doc(document_private_items)` //~| NOTE `doc(no_default_passes)` is now a no-op //~| NOTE `#[deny(invalid_doc_attributes)]` on by default #![doc(passes = "collapse-docs unindent-comments")] //~^ ERROR unknown `doc` attribute `passes` //~| NOTE no longer functions //~| NOTE see issue #44136 -//~| HELP you may want to use `doc(document_private_items)` //~| NOTE `doc(passes)` is now a no-op #![doc(plugins = "xxx")] //~^ ERROR unknown `doc` attribute `plugins` diff --git a/tests/rustdoc-ui/deprecated-attrs.stderr b/tests/rustdoc-ui/deprecated-attrs.stderr index 3e9820522338a..323257f944ce7 100644 --- a/tests/rustdoc-ui/deprecated-attrs.stderr +++ b/tests/rustdoc-ui/deprecated-attrs.stderr @@ -10,22 +10,20 @@ LL | #![doc(no_default_passes)] | ^^^^^^^^^^^^^^^^^ no longer functions | = note: `doc` attribute `no_default_passes` no longer functions; see issue #44136 - = help: you may want to use `doc(document_private_items)` = note: `doc(no_default_passes)` is now a no-op = note: `#[deny(invalid_doc_attributes)]` on by default error: unknown `doc` attribute `passes` - --> $DIR/deprecated-attrs.rs:10:8 + --> $DIR/deprecated-attrs.rs:9:8 | LL | #![doc(passes = "collapse-docs unindent-comments")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no longer functions | = note: `doc` attribute `passes` no longer functions; see issue #44136 - = help: you may want to use `doc(document_private_items)` = note: `doc(passes)` is now a no-op error: unknown `doc` attribute `plugins` - --> $DIR/deprecated-attrs.rs:16:8 + --> $DIR/deprecated-attrs.rs:14:8 | LL | #![doc(plugins = "xxx")] | ^^^^^^^^^^^^^^^ no longer functions