Skip to content

Commit f9fa3fe

Browse files
committed
add an attribute to inner doctest fn
1 parent 830ceaa commit f9fa3fe

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/librustdoc/doctest.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -551,17 +551,18 @@ crate fn make_test(
551551
} else {
552552
"_inner".into()
553553
};
554+
let inner_attr = if test_id.is_some() { "#[allow(non_snake_case)] " } else { "" };
554555
let (main_pre, main_post) = if returns_result {
555556
(
556557
format!(
557-
"fn main() {{ fn {}() -> Result<(), impl core::fmt::Debug> {{\n",
558-
inner_fn_name
558+
"fn main() {{ {}fn {}() -> Result<(), impl core::fmt::Debug> {{\n",
559+
inner_attr, inner_fn_name
559560
),
560561
format!("\n}}; {}().unwrap() }}", inner_fn_name),
561562
)
562563
} else if test_id.is_some() {
563564
(
564-
format!("fn main() {{ fn {}() {{\n", inner_fn_name),
565+
format!("fn main() {{ {}fn {}() {{\n", inner_attr, inner_fn_name),
565566
format!("\n}}; {}() }}", inner_fn_name),
566567
)
567568
} else {

src/librustdoc/doctest/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@ fn make_test_named_wrapper() {
304304
let opts = TestOptions::default();
305305
let input = "assert_eq!(2+2, 4);";
306306
let expected = "#![allow(unused)]
307-
fn main() { fn _doctest_main_some_unique_name() {
307+
fn main() { #[allow(non_snake_case)] fn _doctest_main__some_unique_name() {
308308
assert_eq!(2+2, 4);
309-
}; _doctest_main_some_unique_name() }"
309+
}; _doctest_main__some_unique_name() }"
310310
.to_string();
311311
let (output, len, _) =
312-
make_test(input, None, false, &opts, DEFAULT_EDITION, Some("some_unique_name"));
312+
make_test(input, None, false, &opts, DEFAULT_EDITION, Some("_some_unique_name"));
313313
assert_eq!((output, len), (expected, 2));
314314
}

0 commit comments

Comments
 (0)