rust #23856 is fixed on stable

The workaround for rust-lang/rust#23856 can now be removed.
ExpHP · Mar 23, 2019 · 25af333 · 25af333
1 parent 6ff2d31
commit 25af333
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/tasks/cmd/relaxation.rs b/src/tasks/cmd/relaxation.rs
@@ -14,7 +14,7 @@
 
 use crate::{FailResult, FailOk};
 use crate::filetypes::stored_structure::StoredStructure;
-use crate::potential::{self, PotentialBuilder, DiffFn, BondDiffFn, DynFlatDiffFn};
+use crate::potential::{self, PotentialBuilder, DiffFn, BondDiffFn, FlatDiffFn};
 use crate::meta::{self, prelude::*};
 use crate::hlist_aliases::*;
 use crate::math::basis::{Basis3, EvDirection};
@@ -614,7 +614,7 @@ fn flat_constrained_position(
 // There will be one coordinate for each eigenvector.
 fn constrained_diff_fn<'a>(
     // operates on 3N coords
-    flat_3n_diff_fn: &'a mut DynFlatDiffFn<'a>,
+    flat_3n_diff_fn: &'a mut dyn FlatDiffFn,
     // K values, K <= 3N
     flat_init_pos: &'a [f64],
     // K eigenvectors

diff --git a/src/tasks/potential/mod.rs b/src/tasks/potential/mod.rs
@@ -39,9 +39,6 @@ pub trait FlatDiffFn: FnMut(&[f64]) -> FailResult<(f64, Vec<f64>)> {}
 
 impl<F> FlatDiffFn for F where F: FnMut(&[f64]) -> FailResult<(f64, Vec<f64>)> {}
 
-// Type aliases for the trait object types, to work around #23856
-pub type DynFlatDiffFn<'a> = dyn FlatDiffFn<Output=FailResult<(f64, Vec<f64>)>> + 'a;
-
 /// This is what gets passed around by very high level code to represent a
 /// potential function. Basically:
 ///
@@ -125,8 +122,8 @@ pub trait PotentialBuilder<Meta = CommonMeta>
     ///
     /// Because Boxes don't implement `Fn` traits for technical reasons,
     /// you will likely need to write `&mut *flat_diff_fn` in order to get
-    /// a `&mut DynFlatDiffFn`.
-    fn initialize_flat_diff_fn(&self, init_coords: &Coords, meta: Meta) -> FailResult<Box<DynFlatDiffFn<'static>>>
+    /// a `&mut dyn FlatDiffFn`.
+    fn initialize_flat_diff_fn(&self, init_coords: &Coords, meta: Meta) -> FailResult<Box<dyn FlatDiffFn>>
     where Meta: Clone + 'static
     {
         let mut diff_fn = self.initialize_diff_fn(init_coords, meta.clone())?;
@@ -255,7 +252,7 @@ where Meta: Clone + 'static,
     fn initialize_diff_fn(&self, coords: &Coords, meta: Meta) -> FailResult<Box<dyn DiffFn<Meta>>>
     { (**self).initialize_diff_fn(coords, meta) }
 
-    fn initialize_flat_diff_fn(&self, coords: &Coords, meta: Meta) -> FailResult<Box<DynFlatDiffFn<'static>>>
+    fn initialize_flat_diff_fn(&self, coords: &Coords, meta: Meta) -> FailResult<Box<dyn FlatDiffFn>>
     { (**self).initialize_flat_diff_fn(coords, meta) }
 
     fn initialize_bond_diff_fn(&self, init_coords: &Coords, meta: Meta) -> FailResult<Option<Box<dyn BondDiffFn<Meta>>>>
@@ -511,7 +508,7 @@ impl dyn PotentialBuilder {
 
 pub struct Rsp2MinimizeDiffFnShim {
     pub ndim: usize,
-    pub diff_fn: Box<DynFlatDiffFn<'static>>
+    pub diff_fn: Box<dyn FlatDiffFn>
 }
 
 impl<'a> rsp2_minimize::test::n_dee::OnceDifferentiable for Rsp2MinimizeDiffFnShim {