nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use FnOnce instead of FnBox in libtest

Browse Source
This commit is contained in:
Simon Sapin 2019-05-24 07:51:48 +02:00
parent fd8e23c6b2
commit a8fc09be39
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtest/lib.rs
View File

@ -22,7 +22,6 @@
#![unstable(feature = "test", issue = "27812")] #![unstable(feature = "test", issue = "27812")]
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
#![feature(asm)] #![feature(asm)]
#![feature(fnbox)]
#![cfg_attr(any(unix, target_os = "cloudabi"), feature(libc, rustc_private))] #![cfg_attr(any(unix, target_os = "cloudabi"), feature(libc, rustc_private))]
#![feature(nll)] #![feature(nll)]
#![feature(set_stdio)] #![feature(set_stdio)]
@ -56,7 +55,6 @@ pub use self::TestResult::*;
use std::any::Any; use std::any::Any;
use std::borrow::Cow; use std::borrow::Cow;
use std::boxed::FnBox;
use std::cmp; use std::cmp;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::env; use std::env;
@ -174,7 +172,7 @@ pub trait TDynBenchFn: Send {
pub enum TestFn { pub enum TestFn {
StaticTestFn(fn()), StaticTestFn(fn()),
StaticBenchFn(fn(&mut Bencher)), StaticBenchFn(fn(&mut Bencher)),
DynTestFn(Box<dyn FnBox() + Send>), DynTestFn(Box<dyn FnOnce() + Send>),
DynBenchFn(Box<dyn TDynBenchFn + 'static>), DynBenchFn(Box<dyn TDynBenchFn + 'static>),
} }
@ -1447,7 +1445,7 @@ pub fn run_test(
desc: TestDesc, desc: TestDesc,
monitor_ch: Sender<MonitorMsg>, monitor_ch: Sender<MonitorMsg>,
nocapture: bool, nocapture: bool,
testfn: Box<dyn FnBox() + Send>, testfn: Box<dyn FnOnce() + Send>,
concurrency: Concurrent, concurrency: Concurrent,
) { ) {
// Buffer for capturing standard I/O // Buffer for capturing standard I/O