edition update

Cargo.toml

@@ -2,6 +2,7 @@
 name    = "eom"
 version = "0.10.1-alpha.0"
 authors = ["Toshiki Teramura <[email protected]>"]
+edition = "2018"
 
 description   = "Configurable ODE/PDE solver"
 documentation = "https://docs.rs/eom/"

src/lib.rs

@@ -1,13 +1,5 @@
 //! Configurable ODE/PDE solver
 
-#[macro_use]
-extern crate derive_new;
-extern crate fftw;
-extern crate ndarray;
-extern crate ndarray_linalg;
-extern crate num_complex;
-extern crate num_traits;
-
 pub mod adaptor;
 pub mod explicit;
 pub mod lyapunov;

src/lyapunov.rs

@@ -4,7 +4,7 @@ use ndarray::*;
 use ndarray_linalg::*;
 use num_traits::{Float, One};
 
-use traits::*;
+use crate::traits::*;
 
 /// Jacobian operator using numerical-differentiation
 pub struct Jacobian<'jac, A, D, TEO>

src/ode/goy_shell.rs

@@ -4,9 +4,9 @@ use ndarray::*;
 use num_complex::Complex64 as c64;
 use num_traits::{PrimInt, Zero};
 
-use traits::*;
+use crate::traits::*;
 
-#[derive(Clone, Copy, Debug, new)]
+#[derive(Clone, Copy, Debug)]
 pub struct GoyShell {
     size: usize,
     nu: f64,

src/ode/lorenz63.rs

@@ -3,7 +3,7 @@
 
 use ndarray::*;
 
-use traits::*;
+use crate::traits::*;
 
 #[derive(Clone, Copy, Debug)]
 pub struct Lorenz63 {

src/ode/lorenz96.rs

@@ -1,10 +1,10 @@
 //! Lorenz 96 model
 //! https://en.wikipedia.org/wiki/Lorenz_96_model
 
+use crate::traits::*;
 use ndarray::*;
-use traits::*;
 
-#[derive(Clone, Copy, Debug, new)]
+#[derive(Clone, Copy, Debug)]
 pub struct Lorenz96 {
     pub f: f64,
     pub n: usize,

src/ode/roessler.rs

@@ -1,8 +1,8 @@
 //! Roessler system
 //! https://en.wikipedia.org/wiki/Lorenz_syste://en.wikipedia.org/wiki/R%C3%B6ssler_attractor
 
+use crate::traits::*;
 use ndarray::*;
-use traits::*;
 
 #[derive(Clone, Copy, Debug)]
 pub struct Roessler {

src/pde/kse.rs

@@ -8,7 +8,7 @@ use ndarray::*;
 use std::f64::consts::PI;
 
 use super::Pair;
-use traits::*;
+use crate::traits::*;
 
 /// One-dimensional Kuramoto-Sivashinsky equation with spectral-method
 pub struct KSE {

src/traits.rs

@@ -20,15 +20,18 @@ pub trait TimeStep {
 /// Core implementation for explicit schemes
 pub trait Explicit: ModelSpec {
     /// calculate right hand side (rhs) of Explicit from current state
-    fn rhs<'a, S>(&mut self, &'a mut ArrayBase<S, Self::Dim>) -> &'a mut ArrayBase<S, Self::Dim>
+    fn rhs<'a, S>(&mut self, x: &'a mut ArrayBase<S, Self::Dim>) -> &'a mut ArrayBase<S, Self::Dim>
     where
         S: DataMut<Elem = Self::Scalar>;
 }
 
 /// Core implementation for semi-implicit schemes
 pub trait SemiImplicit: ModelSpec {
     /// non-linear part of stiff equation
-    fn nlin<'a, S>(&mut self, &'a mut ArrayBase<S, Self::Dim>) -> &'a mut ArrayBase<S, Self::Dim>
+    fn nlin<'a, S>(
+        &mut self,
+        x: &'a mut ArrayBase<S, Self::Dim>,
+    ) -> &'a mut ArrayBase<S, Self::Dim>
     where
         S: DataMut<Elem = Self::Scalar>;
     /// diagonal elements of stiff linear part
@@ -40,7 +43,7 @@ pub trait TimeEvolution: ModelSpec + TimeStep {
     /// calculate next step
     fn iterate<'a, S>(
         &mut self,
-        &'a mut ArrayBase<S, Self::Dim>,
+        x: &'a mut ArrayBase<S, Self::Dim>,
     ) -> &'a mut ArrayBase<S, Self::Dim>
     where
         S: DataMut<Elem = Self::Scalar>;

tests/lyapunov.rs

@@ -1,8 +1,3 @@
-extern crate eom;
-extern crate ndarray;
-#[macro_use]
-extern crate ndarray_linalg;
-
 use ndarray::*;
 use ndarray_linalg::*;
 

tests/pde.rs

@@ -1,8 +1,3 @@
-extern crate eom;
-extern crate ndarray;
-#[macro_use]
-extern crate ndarray_linalg;
-
 use ndarray::*;
 use ndarray_linalg::*;
 use std::f64::consts::PI;