nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 19:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove nested function from run_test

Browse Source 
The inner function is not needed anymore as it's only called once after
the previous commit's refactoring.
This commit is contained in:
Pietro Albini 2023-05-26 14:56:59 +02:00
parent b1d60bc076
commit fa451fe6db
No known key found for this signature in database
GPG Key ID: CD76B35F7734769E
1 changed files with 47 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
library/test/src/lib.rs
View File

@ -559,38 +559,36 @@ pub fn run_test(
return None; return None;
} }
struct TestRunOpts { match testfn.into_runnable() {
pub strategy: RunStrategy, Runnable::Test(runnable_test) => {
pub nocapture: bool, if runnable_test.is_dynamic() {
pub time: Option<time::TestTimeOptions>, match strategy {
RunStrategy::InProcess => (),
_ => panic!("Cannot run dynamic test fn out-of-process"),
};
} }
fn run_test_inner(
id: TestId,
desc: TestDesc,
monitor_ch: Sender<CompletedTest>,
runnable_test: RunnableTest,
opts: TestRunOpts,
) -> Option<thread::JoinHandle<()>> {
let name = desc.name.clone(); let name = desc.name.clone();
let nocapture = opts.nocapture;
let time_options = opts.time_options;
let runtest = move || match opts.strategy { let runtest = move || match strategy {
RunStrategy::InProcess => run_test_in_process( RunStrategy::InProcess => run_test_in_process(
id, id,
desc, desc,
opts.nocapture, nocapture,
opts.time.is_some(), time_options.is_some(),
runnable_test, runnable_test,
monitor_ch, monitor_ch,
opts.time, time_options,
), ),
RunStrategy::SpawnPrimary => spawn_test_subprocess( RunStrategy::SpawnPrimary => spawn_test_subprocess(
id, id,
desc, desc,
opts.nocapture, nocapture,
opts.time.is_some(), time_options.is_some(),
monitor_ch, monitor_ch,
opts.time, time_options,
), ),
}; };
@ -617,20 +615,6 @@ pub fn run_test(
None None
} }
} }
let test_run_opts =
TestRunOpts { strategy, nocapture: opts.nocapture, time: opts.time_options };
match testfn.into_runnable() {
Runnable::Test(runnable_test) => {
if runnable_test.is_dynamic() {
match strategy {
RunStrategy::InProcess => (),
_ => panic!("Cannot run dynamic test fn out-of-process"),
};
}
run_test_inner(id, desc, monitor_ch, runnable_test, test_run_opts)
}
Runnable::Bench(runnable_bench) => { Runnable::Bench(runnable_bench) => {
// Benchmarks aren't expected to panic, so we run them all in-process. // Benchmarks aren't expected to panic, so we run them all in-process.
runnable_bench.run(id, &desc, &monitor_ch, opts.nocapture); runnable_bench.run(id, &desc, &monitor_ch, opts.nocapture);