mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove RunnableDoctest

Browse Source 
It should instead be the actual input to the running logic. Currently
it's not actually quite runnable since it's still missing some
information.
This commit is contained in:
Noah Lev 2024-06-03 22:49:54 -07:00 committed by Guillaume Gomez
parent e9e2634547
commit a429afacbc
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/librustdoc/doctest.rs
View File

@ -1086,13 +1086,11 @@ impl CreateRunnableDoctests {
},
testfn: test::DynTestFn(Box::new(move || {
doctest_run_fn(
RunnableDoctest {
crate_name,
rustdoc_test_options,
opts,
path,
scraped_test: test,
},
crate_name,
rustdoc_test_options,
opts,
path,
test,
rustdoc_options,
unused_externs,
)
@ -1101,36 +1099,31 @@ impl CreateRunnableDoctests {
}
}
/// A doctest that is ready to run.
struct RunnableDoctest {
fn doctest_run_fn(
crate_name: String,
rustdoc_test_options: IndividualTestOptions,
opts: GlobalTestOptions,
test_opts: IndividualTestOptions,
global_opts: GlobalTestOptions,
path: PathBuf,
scraped_test: ScrapedDoctest,
}
fn doctest_run_fn(
runnable_test: RunnableDoctest,
rustdoc_options: Arc<RustdocOptions>,
unused_externs: Arc<Mutex<Vec<UnusedExterns>>>,
) -> Result<(), String> {
let report_unused_externs = |uext| {
unused_externs.lock().unwrap().push(uext);
};
let no_run = runnable_test.scraped_test.no_run(&rustdoc_options);
let edition = runnable_test.scraped_test.edition(&rustdoc_options);
let no_run = scraped_test.no_run(&rustdoc_options);
let edition = scraped_test.edition(&rustdoc_options);
let res = run_test(
&runnable_test.scraped_test.text,
&runnable_test.crate_name,
runnable_test.scraped_test.line,
&scraped_test.text,
&crate_name,
scraped_test.line,
&rustdoc_options,
runnable_test.rustdoc_test_options,
runnable_test.scraped_test.langstr,
test_opts,
scraped_test.langstr,
no_run,
&runnable_test.opts,
&global_opts,
edition,
runnable_test.path,
path,
report_unused_externs,
);