Skip to content

Commit 80f7ca0

Browse files
author
David Ramos
committed
Remove FnBox
Support latest nightly after rust-lang/rust#62043 was merged.
1 parent 3c0ee19 commit 80f7ca0

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/data.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! Support module for `#[datatest::data(..)]`
22
use serde::de::DeserializeOwned;
3-
use std::boxed::FnBox;
43
use test::TDynBenchFn;
54
use yaml_rust::parser::Event;
65
use yaml_rust::scanner::Marker;
@@ -17,8 +16,8 @@ pub struct DataTestDesc {
1716
/// Used internally for `#[datatest::data(..)]` tests.
1817
#[doc(hidden)]
1918
pub enum DataTestFn {
20-
TestFn(Box<FnBox() + Send + 'static>),
21-
BenchFn(Box<TDynBenchFn + 'static>),
19+
TestFn(Box<dyn FnOnce() + Send + 'static>),
20+
BenchFn(Box<dyn TDynBenchFn + 'static>),
2221
}
2322

2423
#[doc(hidden)]

src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![feature(test)]
22
#![feature(specialization)]
3-
#![feature(fnbox)]
43
#![feature(termination_trait_lib)]
54
//! Crate for supporting data-driven tests.
65
//!

src/runner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ fn adjust_for_test_name(opts: &mut crate::test::TestOpts, name: &str) {
223223
/// For regular tests, mapping is one-to-one, for our data driven tests, we generate as many
224224
/// descriptors as test cases we discovered.
225225
#[doc(hidden)]
226-
pub fn runner(tests: &[&TestDescriptor]) {
226+
pub fn runner(tests: &[&dyn TestDescriptor]) {
227227
let args = std::env::args().collect::<Vec<_>>();
228228
let mut opts = match crate::test::parse_opts(&args) {
229229
Some(Ok(o)) => o,

0 commit comments

Comments
 (0)