diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2021-07-22 17:01:12 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2021-07-22 17:01:12 +0200 |
| commit | ef953b096ec094ee6a2f69fd62028c1540f9573c (patch) | |
| tree | 079419a575df056047915209a65e45755e205675 /src/librustdoc/markdown.rs | |
| parent | 05f2326c0570fdd64f53532a089bbbc361d190e6 (diff) | |
| download | rust-ef953b096ec094ee6a2f69fd62028c1540f9573c.tar.gz rust-ef953b096ec094ee6a2f69fd62028c1540f9573c.zip | |
Move calls to test_main into one function
Diffstat (limited to 'src/librustdoc/markdown.rs')
| -rw-r--r-- | src/librustdoc/markdown.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs index 6c8b95c04c9..80af2a7aaf5 100644 --- a/src/librustdoc/markdown.rs +++ b/src/librustdoc/markdown.rs @@ -115,7 +115,7 @@ crate fn render<P: AsRef<Path>>( } /// Runs any tests/code examples in the markdown file `input`. -crate fn test(mut options: Options) -> Result<(), String> { +crate fn test(options: Options) -> Result<(), String> { let input_str = read_to_string(&options.input) .map_err(|err| format!("{}: {}", options.input.display(), err))?; let mut opts = TestOptions::default(); @@ -135,14 +135,11 @@ crate fn test(mut options: Options) -> Result<(), String> { find_testable_code(&input_str, &mut collector, codes, options.enable_per_target_ignores, None); - options.test_args.insert(0, "rustdoctest".to_string()); - if options.nocapture { - options.test_args.push("--nocapture".to_string()); - } - test::test_main( - &options.test_args, + crate::doctest::run_tests( + options.test_args, + options.nocapture, + options.display_warnings, collector.tests, - Some(test::Options::new().display_output(options.display_warnings)), ); Ok(()) } |
