From 80f7ca08402eeee1cc3c96adfb291fc4d1177e66 Mon Sep 17 00:00:00 2001
From: David Ramos <david@commure.com>
Date: Tue, 2 Jul 2019 16:05:23 -0700
Subject: [PATCH] Remove FnBox

Support latest nightly after
https://github.com/rust-lang/rust/pull/62043 was merged.
---
 src/data.rs   | 5 ++---
 src/lib.rs    | 1 -
 src/runner.rs | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index eb353a8..60bdef5 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -1,6 +1,5 @@
 //! Support module for `#[datatest::data(..)]`
 use serde::de::DeserializeOwned;
-use std::boxed::FnBox;
 use test::TDynBenchFn;
 use yaml_rust::parser::Event;
 use yaml_rust::scanner::Marker;
@@ -17,8 +16,8 @@ pub struct DataTestDesc {
 /// Used internally for `#[datatest::data(..)]` tests.
 #[doc(hidden)]
 pub enum DataTestFn {
-    TestFn(Box<FnBox() + Send + 'static>),
-    BenchFn(Box<TDynBenchFn + 'static>),
+    TestFn(Box<dyn FnOnce() + Send + 'static>),
+    BenchFn(Box<dyn TDynBenchFn + 'static>),
 }
 
 #[doc(hidden)]
diff --git a/src/lib.rs b/src/lib.rs
index a630696..f4684ca 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,5 @@
 #![feature(test)]
 #![feature(specialization)]
-#![feature(fnbox)]
 #![feature(termination_trait_lib)]
 //! Crate for supporting data-driven tests.
 //!
diff --git a/src/runner.rs b/src/runner.rs
index 0aa96d2..ff4a88d 100644
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -223,7 +223,7 @@ fn adjust_for_test_name(opts: &mut crate::test::TestOpts, name: &str) {
 /// For regular tests, mapping is one-to-one, for our data driven tests, we generate as many
 /// descriptors as test cases we discovered.
 #[doc(hidden)]
-pub fn runner(tests: &[&TestDescriptor]) {
+pub fn runner(tests: &[&dyn TestDescriptor]) {
     let args = std::env::args().collect::<Vec<_>>();
     let mut opts = match crate::test::parse_opts(&args) {
         Some(Ok(o)) => o,