Skip to content

Commit aacbcd1

Browse files
authored
Rollup merge of rust-lang#139592 - camelid:doctest-md-opts, r=notriddle
rustdoc: Enable Markdown extensions when looking for doctests Fixes rust-lang#139064. We should enable these to avoid misinterpreting uses of the extended syntax as code blocks. This happens in practice with multi-paragraph footnotes, as discovered in rust-lang#139064.
2 parents 13faa56 + 8b227a4 commit aacbcd1

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

Diff for: src/librustdoc/html/markdown.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ pub(crate) fn find_codes<T: doctest::DocTestVisitor>(
721721
extra_info: Option<&ExtraInfo<'_>>,
722722
include_non_rust: bool,
723723
) {
724-
let mut parser = Parser::new(doc).into_offset_iter();
724+
let mut parser = Parser::new_ext(doc, main_body_opts()).into_offset_iter();
725725
let mut prev_offset = 0;
726726
let mut nb_lines = 0;
727727
let mut register_header = None;

Diff for: tests/rustdoc-ui/multi-par-footnote.rs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//@ check-pass
2+
//@ compile-flags:--test
3+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
// Regression test for #139064.
5+
6+
/// Example
7+
///
8+
/// Footnote with multiple paragraphs[^multiple]
9+
///
10+
/// [^multiple]:
11+
/// One
12+
///
13+
/// Two
14+
///
15+
/// Three
16+
pub fn add(left: u64, right: u64) -> u64 {
17+
left + right
18+
}

Diff for: tests/rustdoc-ui/multi-par-footnote.stdout

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
running 0 tests
3+
4+
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
5+

0 commit comments

Comments
 (0)