Merge pull request #69 from rust-math/rust2018

Rust 2018

Author: termoshtt

fftw-src/Cargo.toml

@@ -2,6 +2,7 @@
 name = "fftw-src"
 version = "0.3.0"
 authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>"]
+edition = "2018"
 
 description = "Source of FFTW"
 repository = "https://github.com/termoshtt/rust-fftw3"

fftw-src/build.rs

@@ -1,10 +1,3 @@
-extern crate cc;
-extern crate failure;
-extern crate ftp;
-extern crate md5;
-extern crate reqwest;
-extern crate zip;
-
 use failure::*;
 use std::env::var;
 use std::fs;

fftw-sys/Cargo.toml

@@ -2,6 +2,7 @@
 name = "fftw-sys"
 version = "0.5.0"
 authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>"]
+edition = "2018"
 
 description = "unsafe wrapper of FFTW3"
 repository = "https://github.com/termoshtt/rust-fftw3"

fftw-sys/src/lib.rs

@@ -1,13 +1,10 @@
 #![allow(non_camel_case_types)]
 
 #[cfg(feature = "source")]
-extern crate fftw_src;
+extern crate fftw_src as ffi;
 
 #[cfg(feature = "intel-mkl")]
-extern crate intel_mkl_src;
-
-extern crate libc;
-extern crate num_complex;
+extern crate intel_mkl_src as ffi;
 
 mod test;
 

fftw/Cargo.toml

@@ -2,6 +2,7 @@
 name = "fftw"
 version = "0.6.0"
 authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>"]
+edition = "2018"
 
 description = "safe wrapper of FFTW3"
 repository = "https://github.com/termoshtt/rust-fftw3"

fftw/src/array.rs

@@ -1,7 +1,7 @@
 //! Array with SIMD alignment
 
+use crate::types::*;
 use ffi;
-use types::*;
 
 use num_traits::Zero;
 use std::ops::{Deref, DerefMut};

fftw/src/error.rs

@@ -1,4 +1,5 @@
-use array::Alignment;
+use crate::array::Alignment;
+use failure::Fail;
 
 pub type Result<T> = ::std::result::Result<T, Error>;
 

fftw/src/lib.rs

@@ -42,17 +42,9 @@
 //! c2r.c2r(&mut a, &mut b).unwrap();
 //! ```
 
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate failure;
-#[macro_use]
-extern crate bitflags;
-extern crate num_complex;
-extern crate num_traits;
-
 extern crate fftw_sys as ffi;
 
+use lazy_static::lazy_static;
 use std::sync::Mutex;
 
 lazy_static! {

fftw/src/plan.rs

@@ -3,10 +3,10 @@
 //! See also [Using Plans] in the original document
 //! [Using Plans]: http://www.fftw.org/fftw3_doc/Using-Plans.html
 
-use array::{alignment_of, AlignedAllocable, AlignedVec, Alignment};
-use error::*;
-use ffi::*;
-use types::{c32, c64, Flag, R2RKind, Sign};
+use crate::array::{alignment_of, AlignedAllocable, AlignedVec, Alignment};
+use crate::error::*;
+use crate::ffi::*;
+use crate::types::{c32, c64, Flag, R2RKind, Sign};
 
 use std::marker::PhantomData;
 

fftw/src/types.rs

@@ -1,5 +1,6 @@
 //! Rusty types for manipulating FFTW
 
+use bitflags::bitflags;
 pub use ffi::fftw_complex as c64;
 pub use ffi::fftwf_complex as c32;