diff --git a/compiler/rustc_feature/src/accepted.rs b/compiler/rustc_feature/src/accepted.rs
index de2bd60ffad82..dfa8b9bb1f49b 100644
--- a/compiler/rustc_feature/src/accepted.rs
+++ b/compiler/rustc_feature/src/accepted.rs
@@ -138,6 +138,8 @@ declare_features! (
(accepted, copy_closures, "1.26.0", Some(44490)),
/// Allows `crate` in paths.
(accepted, crate_in_paths, "1.30.0", Some(45477)),
+ /// Allows users to provide classes for fenced code block using `class:classname`.
+ (accepted, custom_code_classes_in_docs, "CURRENT_RUSTC_VERSION", Some(79483)),
/// Allows using `#[debugger_visualizer]` attribute.
(accepted, debugger_visualizer, "1.71.0", Some(95939)),
/// Allows rustc to inject a default alloc_error_handler
diff --git a/compiler/rustc_feature/src/unstable.rs b/compiler/rustc_feature/src/unstable.rs
index 132e2ddee2953..b41eedd17a0ab 100644
--- a/compiler/rustc_feature/src/unstable.rs
+++ b/compiler/rustc_feature/src/unstable.rs
@@ -424,8 +424,6 @@ declare_features! (
/// Allows function attribute `#[coverage(on/off)]`, to control coverage
/// instrumentation of that function.
(unstable, coverage_attribute, "1.74.0", Some(84605)),
- /// Allows users to provide classes for fenced code block using `class:classname`.
- (unstable, custom_code_classes_in_docs, "1.74.0", Some(79483)),
/// Allows non-builtin attributes in inner attribute position.
(unstable, custom_inner_attributes, "1.30.0", Some(54726)),
/// Allows custom test frameworks with `#![test_runner]` and `#[test_case]`.
diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md
index bdb55de8d634e..39f24a13143c8 100644
--- a/src/doc/rustdoc/src/unstable-features.md
+++ b/src/doc/rustdoc/src/unstable-features.md
@@ -624,47 +624,3 @@ add the `--scrape-tests` flag.
This flag enables the generation of links in the source code pages which allow the reader
to jump to a type definition.
-
-### Custom CSS classes for code blocks
-
-```rust
-#![feature(custom_code_classes_in_docs)]
-
-/// ```custom,{class=language-c}
-/// int main(void) { return 0; }
-/// ```
-pub struct Bar;
-```
-
-The text `int main(void) { return 0; }` is rendered without highlighting in a code block
-with the class `language-c`. This can be used to highlight other languages through JavaScript
-libraries for example.
-
-Without the `custom` attribute, it would be generated as a Rust code example with an additional
-`language-C` CSS class. Therefore, if you specifically don't want it to be a Rust code example,
-don't forget to add the `custom` attribute.
-
-To be noted that you can replace `class=` with `.` to achieve the same result:
-
-```rust
-#![feature(custom_code_classes_in_docs)]
-
-/// ```custom,{.language-c}
-/// int main(void) { return 0; }
-/// ```
-pub struct Bar;
-```
-
-To be noted, `rust` and `.rust`/`class=rust` have different effects: `rust` indicates that this is
-a Rust code block whereas the two others add a "rust" CSS class on the code block.
-
-You can also use double quotes:
-
-```rust
-#![feature(custom_code_classes_in_docs)]
-
-/// ```"not rust" {."hello everyone"}
-/// int main(void) { return 0; }
-/// ```
-pub struct Bar;
-```
diff --git a/src/doc/rustdoc/src/write-documentation/documentation-tests.md b/src/doc/rustdoc/src/write-documentation/documentation-tests.md
index a7d3186fb78b7..9526f33359e4b 100644
--- a/src/doc/rustdoc/src/write-documentation/documentation-tests.md
+++ b/src/doc/rustdoc/src/write-documentation/documentation-tests.md
@@ -376,6 +376,44 @@ that the code sample should be compiled using the respective edition of Rust.
# fn foo() {}
```
+### Custom CSS classes for code blocks
+
+```rust
+/// ```custom,{class=language-c}
+/// int main(void) { return 0; }
+/// ```
+pub struct Bar;
+```
+
+The text `int main(void) { return 0; }` is rendered without highlighting in a code block
+with the class `language-c`. This can be used to highlight other languages through JavaScript
+libraries for example.
+
+Without the `custom` attribute, it would be generated as a Rust code example with an additional
+`language-C` CSS class. Therefore, if you specifically don't want it to be a Rust code example,
+don't forget to add the `custom` attribute.
+
+To be noted that you can replace `class=` with `.` to achieve the same result:
+
+```rust
+/// ```custom,{.language-c}
+/// int main(void) { return 0; }
+/// ```
+pub struct Bar;
+```
+
+To be noted, `rust` and `.rust`/`class=rust` have different effects: `rust` indicates that this is
+a Rust code block whereas the two others add a "rust" CSS class on the code block.
+
+You can also use double quotes:
+
+```rust
+/// ```"not rust" {."hello everyone"}
+/// int main(void) { return 0; }
+/// ```
+pub struct Bar;
+```
+
## Syntax reference
The *exact* syntax for code blocks, including the edge cases, can be found
diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
index 0ad4c9c234647..ca356db0e540c 100644
--- a/src/librustdoc/doctest.rs
+++ b/src/librustdoc/doctest.rs
@@ -1345,7 +1345,6 @@ impl<'a, 'hir, 'tcx> HirCollector<'a, 'hir, 'tcx> {
def_id.to_def_id(),
span_of_fragments(&attrs.doc_strings).unwrap_or(sp),
)),
- self.tcx.features().custom_code_classes_in_docs,
);
}
diff --git a/src/librustdoc/externalfiles.rs b/src/librustdoc/externalfiles.rs
index 57e82b877bf14..f82c77cc9b84e 100644
--- a/src/librustdoc/externalfiles.rs
+++ b/src/librustdoc/externalfiles.rs
@@ -46,8 +46,6 @@ impl ExternalHtml {
edition,
playground,
heading_offset: HeadingOffset::H2,
- // For external files, it'll be disabled until the feature is enabled by default.
- custom_code_classes_in_docs: false,
}
.into_string()
);
@@ -63,8 +61,6 @@ impl ExternalHtml {
edition,
playground,
heading_offset: HeadingOffset::H2,
- // For external files, it'll be disabled until the feature is enabled by default.
- custom_code_classes_in_docs: false,
}
.into_string()
);
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index 5c5651f3ef0e6..0e38ed79a8710 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -20,7 +20,6 @@
//! edition: Edition::Edition2015,
//! playground: &None,
//! heading_offset: HeadingOffset::H2,
-//! custom_code_classes_in_docs: true,
//! };
//! let html = md.into_string();
//! // ... something using html
@@ -97,8 +96,6 @@ pub struct Markdown<'a> {
/// Offset at which we render headings.
/// E.g. if `heading_offset: HeadingOffset::H2`, then `# something` renders an `<h2>`.
pub heading_offset: HeadingOffset,
- /// `true` if the `custom_code_classes_in_docs` feature is enabled.
- pub custom_code_classes_in_docs: bool,
}
/// A struct like `Markdown` that renders the markdown with a table of contents.
pub(crate) struct MarkdownWithToc<'a> {
@@ -107,8 +104,6 @@ pub(crate) struct MarkdownWithToc<'a> {
pub(crate) error_codes: ErrorCodes,
pub(crate) edition: Edition,
pub(crate) playground: &'a Option<Playground>,
- /// `true` if the `custom_code_classes_in_docs` feature is enabled.
- pub(crate) custom_code_classes_in_docs: bool,
}
/// A tuple struct like `Markdown` that renders the markdown escaping HTML tags
/// and includes no paragraph tags.
@@ -209,7 +204,6 @@ struct CodeBlocks<'p, 'a, I: Iterator<Item = Event<'a>>> {
// Information about the playground if a URL has been specified, containing an
// optional crate name and the URL.
playground: &'p Option<Playground>,
- custom_code_classes_in_docs: bool,
}
impl<'p, 'a, I: Iterator<Item = Event<'a>>> CodeBlocks<'p, 'a, I> {
@@ -218,15 +212,8 @@ impl<'p, 'a, I: Iterator<Item = Event<'a>>> CodeBlocks<'p, 'a, I> {
error_codes: ErrorCodes,
edition: Edition,
playground: &'p Option<Playground>,
- custom_code_classes_in_docs: bool,
) -> Self {
- CodeBlocks {
- inner: iter,
- check_error_codes: error_codes,
- edition,
- playground,
- custom_code_classes_in_docs,
- }
+ CodeBlocks { inner: iter, check_error_codes: error_codes, edition, playground }
}
}
@@ -253,12 +240,8 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlocks<'_, 'a, I> {
let LangString { added_classes, compile_fail, should_panic, ignore, edition, .. } =
match kind {
CodeBlockKind::Fenced(ref lang) => {
- let parse_result = LangString::parse_without_check(
- lang,
- self.check_error_codes,
- false,
- self.custom_code_classes_in_docs,
- );
+ let parse_result =
+ LangString::parse_without_check(lang, self.check_error_codes, false);
if !parse_result.rust {
let added_classes = parse_result.added_classes;
let lang_string = if let Some(lang) = parse_result.unknown.first() {
@@ -733,17 +716,8 @@ pub(crate) fn find_testable_code<T: doctest::Tester>(
error_codes: ErrorCodes,
enable_per_target_ignores: bool,
extra_info: Option<&ExtraInfo<'_>>,
- custom_code_classes_in_docs: bool,
) {
- find_codes(
- doc,
- tests,
- error_codes,
- enable_per_target_ignores,
- extra_info,
- false,
- custom_code_classes_in_docs,
- )
+ find_codes(doc, tests, error_codes, enable_per_target_ignores, extra_info, false)
}
pub(crate) fn find_codes<T: doctest::Tester>(
@@ -753,7 +727,6 @@ pub(crate) fn find_codes<T: doctest::Tester>(
enable_per_target_ignores: bool,
extra_info: Option<&ExtraInfo<'_>>,
include_non_rust: bool,
- custom_code_classes_in_docs: bool,
) {
let mut parser = Parser::new(doc).into_offset_iter();
let mut prev_offset = 0;
@@ -772,7 +745,6 @@ pub(crate) fn find_codes<T: doctest::Tester>(
error_codes,
enable_per_target_ignores,
extra_info,
- custom_code_classes_in_docs,
)
}
}
@@ -1167,29 +1139,6 @@ impl<'a, 'tcx> Iterator for TagIterator<'a, 'tcx> {
}
}
-fn tokens(string: &str) -> impl Iterator<Item = LangStringToken<'_>> {
- // Pandoc, which Rust once used for generating documentation,
- // expects lang strings to be surrounded by `{}` and for each token
- // to be proceeded by a `.`. Since some of these lang strings are still
- // loose in the wild, we strip a pair of surrounding `{}` from the lang
- // string and a leading `.` from each token.
-
- let string = string.trim();
-
- let first = string.chars().next();
- let last = string.chars().last();
-
- let string =
- if first == Some('{') && last == Some('}') { &string[1..string.len() - 1] } else { string };
-
- string
- .split(|c| c == ',' || c == ' ' || c == '\t')
- .map(str::trim)
- .map(|token| token.strip_prefix('.').unwrap_or(token))
- .filter(|token| !token.is_empty())
- .map(|token| LangStringToken::LangToken(token))
-}
-
impl Default for LangString {
fn default() -> Self {
Self {
@@ -1213,15 +1162,8 @@ impl LangString {
string: &str,
allow_error_code_check: ErrorCodes,
enable_per_target_ignores: bool,
- custom_code_classes_in_docs: bool,
) -> Self {
- Self::parse(
- string,
- allow_error_code_check,
- enable_per_target_ignores,
- None,
- custom_code_classes_in_docs,
- )
+ Self::parse(string, allow_error_code_check, enable_per_target_ignores, None)
}
fn parse(
@@ -1229,7 +1171,6 @@ impl LangString {
allow_error_code_check: ErrorCodes,
enable_per_target_ignores: bool,
extra: Option<&ExtraInfo<'_>>,
- custom_code_classes_in_docs: bool,
) -> Self {
let allow_error_code_check = allow_error_code_check.as_bool();
let mut seen_rust_tags = false;
@@ -1266,11 +1207,7 @@ impl LangString {
seen_rust_tags = true;
}
LangStringToken::LangToken("custom") => {
- if custom_code_classes_in_docs {
- seen_custom_tag = true;
- } else {
- seen_other_tags = true;
- }
+ seen_custom_tag = true;
}
LangStringToken::LangToken("test_harness") => {
data.test_harness = true;
@@ -1361,16 +1298,12 @@ impl LangString {
data.unknown.push(x.to_owned());
}
LangStringToken::KeyValueAttribute(key, value) => {
- if custom_code_classes_in_docs {
- if key == "class" {
- data.added_classes.push(value.to_owned());
- } else if let Some(extra) = extra {
- extra.error_invalid_codeblock_attr(format!(
- "unsupported attribute `{key}`"
- ));
- }
- } else {
- seen_other_tags = true;
+ if key == "class" {
+ data.added_classes.push(value.to_owned());
+ } else if let Some(extra) = extra {
+ extra.error_invalid_codeblock_attr(format!(
+ "unsupported attribute `{key}`"
+ ));
}
}
LangStringToken::ClassAttribute(class) => {
@@ -1380,11 +1313,7 @@ impl LangString {
}
};
- if custom_code_classes_in_docs {
- call(&mut TagIterator::new(string, extra))
- } else {
- call(&mut tokens(string))
- }
+ call(&mut TagIterator::new(string, extra));
// ignore-foo overrides ignore
if !ignores.is_empty() {
@@ -1407,7 +1336,6 @@ impl Markdown<'_> {
edition,
playground,
heading_offset,
- custom_code_classes_in_docs,
} = self;
// This is actually common enough to special-case
@@ -1430,7 +1358,7 @@ impl Markdown<'_> {
let p = Footnotes::new(p);
let p = LinkReplacer::new(p.map(|(ev, _)| ev), links);
let p = TableWrapper::new(p);
- let p = CodeBlocks::new(p, codes, edition, playground, custom_code_classes_in_docs);
+ let p = CodeBlocks::new(p, codes, edition, playground);
html::push_html(&mut s, p);
s
@@ -1439,14 +1367,7 @@ impl Markdown<'_> {
impl MarkdownWithToc<'_> {
pub(crate) fn into_string(self) -> String {
- let MarkdownWithToc {
- content: md,
- ids,
- error_codes: codes,
- edition,
- playground,
- custom_code_classes_in_docs,
- } = self;
+ let MarkdownWithToc { content: md, ids, error_codes: codes, edition, playground } = self;
let p = Parser::new_ext(md, main_body_opts()).into_offset_iter();
@@ -1458,7 +1379,7 @@ impl MarkdownWithToc<'_> {
let p = HeadingLinks::new(p, Some(&mut toc), ids, HeadingOffset::H1);
let p = Footnotes::new(p);
let p = TableWrapper::new(p.map(|(ev, _)| ev));
- let p = CodeBlocks::new(p, codes, edition, playground, custom_code_classes_in_docs);
+ let p = CodeBlocks::new(p, codes, edition, playground);
html::push_html(&mut s, p);
}
@@ -1899,11 +1820,7 @@ pub(crate) struct RustCodeBlock {
/// Returns a range of bytes for each code block in the markdown that is tagged as `rust` or
/// untagged (and assumed to be rust).
-pub(crate) fn rust_code_blocks(
- md: &str,
- extra_info: &ExtraInfo<'_>,
- custom_code_classes_in_docs: bool,
-) -> Vec<RustCodeBlock> {
+pub(crate) fn rust_code_blocks(md: &str, extra_info: &ExtraInfo<'_>) -> Vec<RustCodeBlock> {
let mut code_blocks = vec![];
if md.is_empty() {
@@ -1920,13 +1837,7 @@ pub(crate) fn rust_code_blocks(
let lang_string = if syntax.is_empty() {
Default::default()
} else {
- LangString::parse(
- &*syntax,
- ErrorCodes::Yes,
- false,
- Some(extra_info),
- custom_code_classes_in_docs,
- )
+ LangString::parse(&*syntax, ErrorCodes::Yes, false, Some(extra_info))
};
if !lang_string.rust {
continue;
diff --git a/src/librustdoc/html/markdown/tests.rs b/src/librustdoc/html/markdown/tests.rs
index 1de97e49b8307..fb74c079c9a4e 100644
--- a/src/librustdoc/html/markdown/tests.rs
+++ b/src/librustdoc/html/markdown/tests.rs
@@ -49,7 +49,7 @@ fn test_unique_id() {
fn test_lang_string_parse() {
fn t(lg: LangString) {
let s = &lg.original;
- assert_eq!(LangString::parse(s, ErrorCodes::Yes, true, None, true), lg)
+ assert_eq!(LangString::parse(s, ErrorCodes::Yes, true, None), lg)
}
t(Default::default());
@@ -305,7 +305,6 @@ fn test_header() {
edition: DEFAULT_EDITION,
playground: &None,
heading_offset: HeadingOffset::H2,
- custom_code_classes_in_docs: true,
}
.into_string();
assert_eq!(output, expect, "original: {}", input);
@@ -357,7 +356,6 @@ fn test_header_ids_multiple_blocks() {
edition: DEFAULT_EDITION,
playground: &None,
heading_offset: HeadingOffset::H2,
- custom_code_classes_in_docs: true,
}
.into_string();
assert_eq!(output, expect, "original: {}", input);
@@ -481,7 +479,7 @@ fn test_markdown_html_escape() {
fn test_find_testable_code_line() {
fn t(input: &str, expect: &[usize]) {
let mut lines = Vec::<usize>::new();
- find_testable_code(input, &mut lines, ErrorCodes::No, false, None, true);
+ find_testable_code(input, &mut lines, ErrorCodes::No, false, None);
assert_eq!(lines, expect);
}
@@ -506,7 +504,6 @@ fn test_ascii_with_prepending_hashtag() {
edition: DEFAULT_EDITION,
playground: &None,
heading_offset: HeadingOffset::H2,
- custom_code_classes_in_docs: true,
}
.into_string();
assert_eq!(output, expect, "original: {}", input);
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 09a53affb14c0..716b6b2390a89 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -504,7 +504,6 @@ fn scrape_examples_help(shared: &SharedContext<'_>) -> String {
edition: shared.edition(),
playground: &shared.playground,
heading_offset: HeadingOffset::H1,
- custom_code_classes_in_docs: false,
}
.into_string()
)
@@ -538,7 +537,6 @@ fn render_markdown<'a, 'cx: 'a>(
heading_offset: HeadingOffset,
) -> impl fmt::Display + 'a + Captures<'cx> {
display_fn(move |f| {
- let custom_code_classes_in_docs = cx.tcx().features().custom_code_classes_in_docs;
write!(
f,
"<div class=\"docblock\">{}</div>",
@@ -550,7 +548,6 @@ fn render_markdown<'a, 'cx: 'a>(
edition: cx.shared.edition(),
playground: &cx.shared.playground,
heading_offset,
- custom_code_classes_in_docs,
}
.into_string()
)
@@ -1868,7 +1865,6 @@ fn render_impl(
</div>",
);
}
- let custom_code_classes_in_docs = cx.tcx().features().custom_code_classes_in_docs;
write!(
w,
"<div class=\"docblock\">{}</div>",
@@ -1880,7 +1876,6 @@ fn render_impl(
edition: cx.shared.edition(),
playground: &cx.shared.playground,
heading_offset: HeadingOffset::H4,
- custom_code_classes_in_docs,
}
.into_string()
);
diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs
index dcd2cf02a30a3..86b319811969d 100644
--- a/src/librustdoc/markdown.rs
+++ b/src/librustdoc/markdown.rs
@@ -82,8 +82,6 @@ pub(crate) fn render<P: AsRef<Path>>(
error_codes,
edition,
playground: &playground,
- // For markdown files, it'll be disabled until the feature is enabled by default.
- custom_code_classes_in_docs: false,
}
.into_string()
} else {
@@ -95,8 +93,6 @@ pub(crate) fn render<P: AsRef<Path>>(
edition,
playground: &playground,
heading_offset: HeadingOffset::H1,
- // For markdown files, it'll be disabled until the feature is enabled by default.
- custom_code_classes_in_docs: false,
}
.into_string()
};
@@ -168,14 +164,7 @@ pub(crate) fn test(options: Options) -> Result<(), String> {
let codes = ErrorCodes::from(options.unstable_features.is_nightly_build());
// For markdown files, custom code classes will be disabled until the feature is enabled by default.
- find_testable_code(
- &input_str,
- &mut collector,
- codes,
- options.enable_per_target_ignores,
- None,
- false,
- );
+ find_testable_code(&input_str, &mut collector, codes, options.enable_per_target_ignores, None);
crate::doctest::run_tests(options.test_args, options.nocapture, collector.tests);
Ok(())
diff --git a/src/librustdoc/passes/calculate_doc_coverage.rs b/src/librustdoc/passes/calculate_doc_coverage.rs
index 60def40588aaa..592dd0a145cf5 100644
--- a/src/librustdoc/passes/calculate_doc_coverage.rs
+++ b/src/librustdoc/passes/calculate_doc_coverage.rs
@@ -208,14 +208,7 @@ impl<'a, 'b> DocVisitor for CoverageCalculator<'a, 'b> {
let has_docs = !i.attrs.doc_strings.is_empty();
let mut tests = Tests { found_tests: 0 };
- find_testable_code(
- &i.doc_value(),
- &mut tests,
- ErrorCodes::No,
- false,
- None,
- self.ctx.tcx.features().custom_code_classes_in_docs,
- );
+ find_testable_code(&i.doc_value(), &mut tests, ErrorCodes::No, false, None);
let has_doc_example = tests.found_tests != 0;
let hir_id = DocContext::as_local_hir_id(self.ctx.tcx, i.item_id).unwrap();
diff --git a/src/librustdoc/passes/check_custom_code_classes.rs b/src/librustdoc/passes/check_custom_code_classes.rs
deleted file mode 100644
index 524795ed77c26..0000000000000
--- a/src/librustdoc/passes/check_custom_code_classes.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-//! NIGHTLY & UNSTABLE CHECK: custom_code_classes_in_docs
-//!
-//! This pass will produce errors when finding custom classes outside of
-//! nightly + relevant feature active.
-
-use super::Pass;
-use crate::clean::{Crate, Item};
-use crate::core::DocContext;
-use crate::fold::DocFolder;
-use crate::html::markdown::{find_codes, ErrorCodes, LangString};
-
-use rustc_errors::StashKey;
-use rustc_feature::GateIssue;
-use rustc_session::parse::add_feature_diagnostics_for_issue;
-use rustc_span::symbol::sym;
-
-pub(crate) const CHECK_CUSTOM_CODE_CLASSES: Pass = Pass {
- name: "check-custom-code-classes",
- run: check_custom_code_classes,
- description: "check for custom code classes without the feature-gate enabled",
-};
-
-pub(crate) fn check_custom_code_classes(krate: Crate, cx: &mut DocContext<'_>) -> Crate {
- if cx.tcx.features().custom_code_classes_in_docs {
- // Nothing to check here if the feature is enabled.
- return krate;
- }
- let mut coll = CustomCodeClassLinter { cx };
-
- coll.fold_crate(krate)
-}
-
-struct CustomCodeClassLinter<'a, 'tcx> {
- cx: &'a DocContext<'tcx>,
-}
-
-impl<'a, 'tcx> DocFolder for CustomCodeClassLinter<'a, 'tcx> {
- fn fold_item(&mut self, item: Item) -> Option<Item> {
- look_for_custom_classes(&self.cx, &item);
- Some(self.fold_item_recur(item))
- }
-}
-
-#[derive(Debug)]
-struct TestsWithCustomClasses {
- custom_classes_found: Vec<String>,
-}
-
-impl crate::doctest::Tester for TestsWithCustomClasses {
- fn add_test(&mut self, _: String, config: LangString, _: usize) {
- self.custom_classes_found.extend(config.added_classes);
- }
-}
-
-pub(crate) fn look_for_custom_classes<'tcx>(cx: &DocContext<'tcx>, item: &Item) {
- if !item.item_id.is_local() {
- // If non-local, no need to check anything.
- return;
- }
-
- let mut tests = TestsWithCustomClasses { custom_classes_found: vec![] };
-
- let dox = item.attrs.doc_value();
- find_codes(&dox, &mut tests, ErrorCodes::No, false, None, true, true);
-
- if !tests.custom_classes_found.is_empty() {
- let span = item.attr_span(cx.tcx);
- let sess = &cx.tcx.sess;
- let mut err = sess
- .dcx()
- .struct_span_warn(span, "custom classes in code blocks will change behaviour");
- add_feature_diagnostics_for_issue(
- &mut err,
- sess,
- sym::custom_code_classes_in_docs,
- GateIssue::Language,
- false,
- None,
- );
-
- err.note(
- // This will list the wrong items to make them more easily searchable.
- // To ensure the most correct hits, it adds back the 'class:' that was stripped.
- format!(
- "found these custom classes: class={}",
- tests.custom_classes_found.join(",class=")
- ),
- );
-
- // A later feature_err call can steal and cancel this warning.
- err.stash(span, StashKey::EarlySyntaxWarning);
- }
-}
diff --git a/src/librustdoc/passes/check_doc_test_visibility.rs b/src/librustdoc/passes/check_doc_test_visibility.rs
index e85b998bfbe1b..8055c8a96e350 100644
--- a/src/librustdoc/passes/check_doc_test_visibility.rs
+++ b/src/librustdoc/passes/check_doc_test_visibility.rs
@@ -112,14 +112,7 @@ pub(crate) fn look_for_tests<'tcx>(cx: &DocContext<'tcx>, dox: &str, item: &Item
let mut tests = Tests { found_tests: 0 };
- find_testable_code(
- dox,
- &mut tests,
- ErrorCodes::No,
- false,
- None,
- cx.tcx.features().custom_code_classes_in_docs,
- );
+ find_testable_code(dox, &mut tests, ErrorCodes::No, false, None);
if tests.found_tests == 0 && cx.tcx.features().rustdoc_missing_doc_code_examples {
if should_have_doc_example(cx, item) {
diff --git a/src/librustdoc/passes/lint/check_code_block_syntax.rs b/src/librustdoc/passes/lint/check_code_block_syntax.rs
index 7b81b5e63be6f..7a09baa4ad7f3 100644
--- a/src/librustdoc/passes/lint/check_code_block_syntax.rs
+++ b/src/librustdoc/passes/lint/check_code_block_syntax.rs
@@ -20,9 +20,7 @@ pub(crate) fn visit_item(cx: &DocContext<'_>, item: &clean::Item) {
if let Some(dox) = &item.opt_doc_value() {
let sp = item.attr_span(cx.tcx);
let extra = crate::html::markdown::ExtraInfo::new(cx.tcx, item.item_id.expect_def_id(), sp);
- for code_block in
- markdown::rust_code_blocks(dox, &extra, cx.tcx.features().custom_code_classes_in_docs)
- {
+ for code_block in markdown::rust_code_blocks(dox, &extra) {
check_rust_syntax(cx, item, dox, code_block);
}
}
diff --git a/src/librustdoc/passes/mod.rs b/src/librustdoc/passes/mod.rs
index 4eeaaa2bb70a9..bb678e3388880 100644
--- a/src/librustdoc/passes/mod.rs
+++ b/src/librustdoc/passes/mod.rs
@@ -35,9 +35,6 @@ pub(crate) use self::calculate_doc_coverage::CALCULATE_DOC_COVERAGE;
mod lint;
pub(crate) use self::lint::RUN_LINTS;
-mod check_custom_code_classes;
-pub(crate) use self::check_custom_code_classes::CHECK_CUSTOM_CODE_CLASSES;
-
/// A single pass over the cleaned documentation.
///
/// Runs in the compiler context, so it has access to types and traits and the like.
@@ -69,7 +66,6 @@ pub(crate) enum Condition {
/// The full list of passes.
pub(crate) const PASSES: &[Pass] = &[
- CHECK_CUSTOM_CODE_CLASSES,
CHECK_DOC_TEST_VISIBILITY,
STRIP_HIDDEN,
STRIP_PRIVATE,
@@ -83,7 +79,6 @@ pub(crate) const PASSES: &[Pass] = &[
/// The list of passes run by default.
pub(crate) const DEFAULT_PASSES: &[ConditionalPass] = &[
- ConditionalPass::always(CHECK_CUSTOM_CODE_CLASSES),
ConditionalPass::always(COLLECT_TRAIT_IMPLS),
ConditionalPass::always(CHECK_DOC_TEST_VISIBILITY),
ConditionalPass::new(STRIP_HIDDEN, WhenNotDocumentHidden),
diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning.rs b/tests/rustdoc-ui/custom_code_classes_in_docs-warning.rs
deleted file mode 100644
index 5398d5833c75e..0000000000000
--- a/tests/rustdoc-ui/custom_code_classes_in_docs-warning.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-// This test ensures that warnings are working as expected for "custom_code_classes_in_docs"
-// feature.
-
-#![feature(custom_code_classes_in_docs)]
-#![deny(warnings)]
-#![feature(no_core)]
-#![no_core]
-
-/// ```{. }
-/// main;
-/// ```
-//~^^^ ERROR unexpected ` ` character after `.`
-pub fn foo() {}
-
-/// ```{class= a}
-/// main;
-/// ```
-//~^^^ ERROR unexpected ` ` character after `=`
-pub fn foo2() {}
-
-/// ```{#id}
-/// main;
-/// ```
-//~^^^ ERROR unexpected character `#`
-pub fn foo3() {}
-
-/// ```{{
-/// main;
-/// ```
-//~^^^ ERROR unexpected character `{`
-pub fn foo4() {}
-
-/// ```}
-/// main;
-/// ```
-//~^^^ ERROR unexpected character `}`
-pub fn foo5() {}
-
-/// ```)
-/// main;
-/// ```
-//~^^^ ERROR unexpected character `)`
-pub fn foo6() {}
-
-/// ```{class=}
-/// main;
-/// ```
-//~^^^ ERROR unexpected `}` character after `=`
-pub fn foo7() {}
-
-/// ```(
-/// main;
-/// ```
-//~^^^ ERROR unclosed comment: missing `)` at the end
-pub fn foo8() {}
-
-/// ```{class=one=two}
-/// main;
-/// ```
-//~^^^ ERROR unexpected `=` character
-pub fn foo9() {}
-
-/// ```{.one.two}
-/// main;
-/// ```
-pub fn foo10() {}
-
-/// ```{class=(one}
-/// main;
-/// ```
-//~^^^ ERROR unexpected `(` character after `=`
-pub fn foo11() {}
-
-/// ```{class=one.two}
-/// main;
-/// ```
-pub fn foo12() {}
-
-/// ```{(comment)}
-/// main;
-/// ```
-//~^^^ ERROR unexpected character `(`
-pub fn foo13() {}
diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning.stderr b/tests/rustdoc-ui/custom_code_classes_in_docs-warning.stderr
deleted file mode 100644
index 14b4b3bab3fad..0000000000000
--- a/tests/rustdoc-ui/custom_code_classes_in_docs-warning.stderr
+++ /dev/null
@@ -1,97 +0,0 @@
-error: unexpected ` ` character after `.`
- --> $DIR/custom_code_classes_in_docs-warning.rs:9:1
- |
-LL | / /// ```{. }
-LL | | /// main;
-LL | | /// ```
- | |_______^
- |
-note: the lint level is defined here
- --> $DIR/custom_code_classes_in_docs-warning.rs:5:9
- |
-LL | #![deny(warnings)]
- | ^^^^^^^^
- = note: `#[deny(rustdoc::invalid_codeblock_attributes)]` implied by `#[deny(warnings)]`
-
-error: unexpected ` ` character after `=`
- --> $DIR/custom_code_classes_in_docs-warning.rs:15:1
- |
-LL | / /// ```{class= a}
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected character `#`
- --> $DIR/custom_code_classes_in_docs-warning.rs:21:1
- |
-LL | / /// ```{#id}
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected character `{`
- --> $DIR/custom_code_classes_in_docs-warning.rs:27:1
- |
-LL | / /// ```{{
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected character `}`
- --> $DIR/custom_code_classes_in_docs-warning.rs:33:1
- |
-LL | / /// ```}
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected character `)`
- --> $DIR/custom_code_classes_in_docs-warning.rs:39:1
- |
-LL | / /// ```)
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected `}` character after `=`
- --> $DIR/custom_code_classes_in_docs-warning.rs:45:1
- |
-LL | / /// ```{class=}
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unclosed comment: missing `)` at the end
- --> $DIR/custom_code_classes_in_docs-warning.rs:51:1
- |
-LL | / /// ```(
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected `=` character
- --> $DIR/custom_code_classes_in_docs-warning.rs:57:1
- |
-LL | / /// ```{class=one=two}
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected `(` character after `=`
- --> $DIR/custom_code_classes_in_docs-warning.rs:68:1
- |
-LL | / /// ```{class=(one}
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: unexpected character `(`
- --> $DIR/custom_code_classes_in_docs-warning.rs:79:1
- |
-LL | / /// ```{(comment)}
-LL | | /// main;
-LL | | /// ```
- | |_______^
-
-error: aborting due to 11 previous errors
-
diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs b/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs
index 57d9038cb0ce1..6b1aa455d9818 100644
--- a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs
+++ b/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs
@@ -1,7 +1,6 @@
// This test ensures that warnings are working as expected for "custom_code_classes_in_docs"
// feature.
-#![feature(custom_code_classes_in_docs)]
#![deny(warnings)]
#![feature(no_core)]
#![no_core]
diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr b/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
index ad049804213d3..fc47404734eed 100644
--- a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
+++ b/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
@@ -1,5 +1,5 @@
error: unclosed quote string `"`
- --> $DIR/custom_code_classes_in_docs-warning3.rs:9:1
+ --> $DIR/custom_code_classes_in_docs-warning3.rs:8:1
|
LL | / /// ```{class="}
LL | | /// main;
@@ -11,14 +11,14 @@ LL | | /// ```
| |_______^
|
note: the lint level is defined here
- --> $DIR/custom_code_classes_in_docs-warning3.rs:5:9
+ --> $DIR/custom_code_classes_in_docs-warning3.rs:4:9
|
LL | #![deny(warnings)]
| ^^^^^^^^
= note: `#[deny(rustdoc::invalid_codeblock_attributes)]` implied by `#[deny(warnings)]`
error: unclosed quote string `"`
- --> $DIR/custom_code_classes_in_docs-warning3.rs:9:1
+ --> $DIR/custom_code_classes_in_docs-warning3.rs:8:1
|
LL | / /// ```{class="}
LL | | /// main;
diff --git a/tests/rustdoc-ui/feature-gate-custom_code_classes_in_docs.rs b/tests/rustdoc-ui/feature-gate-custom_code_classes_in_docs.rs
deleted file mode 100644
index e96444039f4ce..0000000000000
--- a/tests/rustdoc-ui/feature-gate-custom_code_classes_in_docs.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//@ check-pass
-
-/// ```{class=language-c}
-/// int main(void) { return 0; }
-/// ```
-//~^^^ WARNING custom classes in code blocks will change behaviour
-//~| NOTE found these custom classes: class=language-c
-//~| NOTE see issue #79483 <https://github.com/rust-lang/rust/issues/79483>
-//~| NOTE: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
-//~| HELP add `#![feature(custom_code_classes_in_docs)]` to the crate attributes to enable
-pub struct Bar;
-
-/// ```ASN.1
-/// int main(void) { return 0; }
-/// ```
-pub struct Bar2;
diff --git a/tests/rustdoc-ui/feature-gate-custom_code_classes_in_docs.stderr b/tests/rustdoc-ui/feature-gate-custom_code_classes_in_docs.stderr
deleted file mode 100644
index 822806997c26c..0000000000000
--- a/tests/rustdoc-ui/feature-gate-custom_code_classes_in_docs.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-warning: custom classes in code blocks will change behaviour
- --> $DIR/feature-gate-custom_code_classes_in_docs.rs:3:1
- |
-LL | / /// ```{class=language-c}
-LL | | /// int main(void) { return 0; }
-LL | | /// ```
- | |_______^
- |
- = note: see issue #79483 <https://github.com/rust-lang/rust/issues/79483> for more information
- = help: add `#![feature(custom_code_classes_in_docs)]` to the crate attributes to enable
- = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
- = note: found these custom classes: class=language-c
-
-warning: 1 warning emitted
-
diff --git a/tests/rustdoc-ui/issues/issue-91713.stdout b/tests/rustdoc-ui/issues/issue-91713.stdout
index bbea7e5c212ef..1678352436315 100644
--- a/tests/rustdoc-ui/issues/issue-91713.stdout
+++ b/tests/rustdoc-ui/issues/issue-91713.stdout
@@ -1,5 +1,4 @@
Available passes for running rustdoc:
-check-custom-code-classes - check for custom code classes without the feature-gate enabled
check_doc_test_visibility - run various visibility-related lints on doctests
strip-hidden - strips all `#[doc(hidden)]` items from the output
strip-private - strips all private items from a crate which cannot be seen externally, implies strip-priv-imports
@@ -11,7 +10,6 @@ calculate-doc-coverage - counts the number of items with and without documentati
run-lints - runs some of rustdoc's lints
Default passes for rustdoc:
-check-custom-code-classes
collect-trait-impls
check_doc_test_visibility
strip-hidden (when not --document-hidden-items)
diff --git a/tests/rustdoc/custom_code_classes.rs b/tests/rustdoc/custom_code_classes.rs
index cd20d8b7d6c9e..569857a09cbe0 100644
--- a/tests/rustdoc/custom_code_classes.rs
+++ b/tests/rustdoc/custom_code_classes.rs
@@ -1,6 +1,5 @@
// Test for `custom_code_classes_in_docs` feature.
-#![feature(custom_code_classes_in_docs)]
#![crate_name = "foo"]
#![feature(no_core)]
#![no_core]