2018 edition changes

Author: 9prady9

Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+edition       = "2018"
 name          = "arrayfire"
 description   = "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple. ArrayFire's multiple backends (CUDA, OpenCL and native CPU) make it platform independent and highly portable. A few lines of code in ArrayFire can replace dozens of lines of parallel computing code, saving you valuable time and lowering development costs. This crate provides Rust bindings for ArrayFire library."
 version       = "3.6.0"

examples/acoustic_wave.rs

@@ -1,7 +1,5 @@
-extern crate arrayfire as af;
-
-use af::*;
 use std::f64::consts::*;
+use arrayfire::*;
 
 fn main() {
     set_device(0);
@@ -74,7 +72,7 @@ fn acoustic_wave_simulation() {
         }
 
         // Draw the image.
-        win.set_colormap(af::ColorMap::BLUE);
+        win.set_colormap(ColorMap::BLUE);
         win.draw_image(&normalise(&p), None);
 
         it += 1;

examples/conway.rs

@@ -1,6 +1,4 @@
-extern crate arrayfire as af;
-
-use af::*;
+use arrayfire::*;
 
 fn main() {
     set_device(0);

examples/helloworld.rs

@@ -1,8 +1,4 @@
-#[macro_use(af_print)]
-extern crate arrayfire as af;
-extern crate num;
-
-use af::*;
+use arrayfire::*;
 
 #[allow(unused_must_use)]
 fn main() {

examples/histogram.rs

@@ -1,8 +1,6 @@
-extern crate arrayfire as af;
-
-use af::*;
 use std::env;
 use std::path::PathBuf;
+use arrayfire::*;
 
 #[allow(unused_variables)]
 #[allow(unused_must_use)]

examples/pi.rs

@@ -1,8 +1,5 @@
-#[macro_use(mem_info)]
-extern crate arrayfire as af;
-
 use std::time::Instant;
-use af::*;
+use arrayfire::*;
 
 #[allow(unused_must_use)]
 #[allow(unused_variables)]
@@ -25,7 +22,7 @@ fn main() {
         let xplusy = &add(xsqrd, ysqrd, false);
         let root = &sqrt(xplusy);
         let cnst = &constant(1, dims);
-        let (real, imag) = sum_all(&le(root, cnst, false)); 
+        let (real, imag) = sum_all(&le(root, cnst, false));
         let pi_val = real*4.0/(samples as f64);
     }
 

examples/snow.rs

@@ -1,6 +1,4 @@
-extern crate arrayfire as af;
-
-use af::*;
+use arrayfire::*;
 
 #[allow(unused_variables)]
 #[allow(unused_must_use)]

examples/unified.rs

@@ -1,6 +1,4 @@
-extern crate arrayfire as af;
-
-use af::*;
+use arrayfire::*;
 
 #[cfg(op_assign)]
 fn helper(dims: Dim4) {

src/algorithm/mod.rs

@@ -1,11 +1,11 @@
 extern crate libc;
 
-use array::Array;
-use defines::{AfError, BinaryOp};
-use error::HANDLE_ERROR;
+use crate::array::Array;
+use crate::defines::{AfError, BinaryOp};
+use crate::error::HANDLE_ERROR;
 use self::libc::{c_int, c_uint, c_double};
-use util::{AfArray, MutAfArray, MutDouble, MutUint};
-use util::{HasAfEnum, Scanable, RealNumber};
+use crate::util::{AfArray, MutAfArray, MutDouble, MutUint};
+use crate::util::{HasAfEnum, Scanable, RealNumber};
 
 #[allow(dead_code)]
 extern {

src/arith/mod.rs

@@ -1,15 +1,15 @@
 extern crate libc;
 extern crate num;
 
-use dim4::Dim4;
-use array::Array;
-use defines::{AfError};
-use error::HANDLE_ERROR;
+use crate::dim4::Dim4;
+use crate::array::Array;
+use crate::defines::{AfError};
+use crate::error::HANDLE_ERROR;
 use self::libc::{c_int};
-use data::{constant, ConstGenerator, tile};
+use crate::data::{constant, ConstGenerator, tile};
 use self::num::Complex;
-use num::Zero;
-use util::{AfArray, HasAfEnum, ImplicitPromote, MutAfArray};
+use crate::num::Zero;
+use crate::util::{AfArray, HasAfEnum, ImplicitPromote, MutAfArray};
 use std::ops::Neg;
 use std::ops::{Add, Sub, Div, Mul, BitAnd, BitOr, BitXor, Not, Rem, Shl, Shr};
 
@@ -565,10 +565,10 @@ arith_func!(BitXor, bitxor, bitxor);
 #[cfg(op_assign)]
 mod op_assign {
 
-use array::Array;
+use crate::array::Array;
 use super::*;
-use index::{Indexer, assign_gen};
-use seq::Seq;
+use crate::index::{Indexer, assign_gen};
+use crate::seq::Seq;
 use std::mem;
 use std::ops::{AddAssign, SubAssign, DivAssign, MulAssign, RemAssign};
 use std::ops::{BitAndAssign, BitOrAssign, BitXorAssign, ShlAssign, ShrAssign};

src/array.rs

@@ -1,9 +1,9 @@
 extern crate libc;
 
-use dim4::Dim4;
-use defines::{AfError, DType, Backend};
-use error::HANDLE_ERROR;
-use util::{AfArray, DimT, HasAfEnum, MutAfArray, MutVoidPtr};
+use crate::dim4::Dim4;
+use crate::defines::{AfError, DType, Backend};
+use crate::error::HANDLE_ERROR;
+use crate::util::{AfArray, DimT, HasAfEnum, MutAfArray, MutVoidPtr};
 use self::libc::{c_void, c_int, c_uint, c_longlong, c_char};
 use std::marker::PhantomData;
 use std::ffi::CString;

src/backend.rs

@@ -1,7 +1,7 @@
 extern crate libc;
 
-use defines::{AfError, Backend};
-use error::HANDLE_ERROR;
+use crate::defines::{AfError, Backend};
+use crate::error::HANDLE_ERROR;
 use self::libc::{c_int, c_uint, uint8_t};
 
 extern {

src/blas/mod.rs

@@ -1,12 +1,12 @@
 extern crate libc;
 
-use array::Array;
-use defines::AfError;
-use defines::MatProp;
-use error::HANDLE_ERROR;
+use crate::array::Array;
+use crate::defines::AfError;
+use crate::defines::MatProp;
+use crate::error::HANDLE_ERROR;
 use self::libc::{c_uint, c_int};
-use util::{AfArray, MutAfArray, to_u32};
-use util::{FloatingPoint, HasAfEnum};
+use crate::util::{AfArray, MutAfArray, to_u32};
+use crate::util::{FloatingPoint, HasAfEnum};
 
 #[allow(dead_code)]
 extern {

src/data/mod.rs

@@ -1,13 +1,13 @@
 extern crate libc;
 extern crate num;
 
-use array::Array;
-use dim4::Dim4;
-use defines::{AfError};
-use error::HANDLE_ERROR;
+use crate::array::Array;
+use crate::dim4::Dim4;
+use crate::defines::{AfError};
+use crate::error::HANDLE_ERROR;
 use self::libc::{c_int, c_uint, c_double};
 use self::num::Complex;
-use util::{AfArray, DimT, HasAfEnum, Intl, MutAfArray, Uintl};
+use crate::util::{AfArray, DimT, HasAfEnum, Intl, MutAfArray, Uintl};
 use std::vec::Vec;
 
 #[allow(dead_code)]

src/device/mod.rs

@@ -1,11 +1,11 @@
 extern crate libc;
 
-use defines::{AfError};
-use error::HANDLE_ERROR;
+use crate::defines::{AfError};
+use crate::error::HANDLE_ERROR;
 use self::libc::{c_int, size_t, c_char};
 use std::ffi::{CStr, CString};
 use std::borrow::Cow;
-use util::free_host;
+use crate::util::free_host;
 
 extern {
     fn af_get_version(major: *mut c_int, minor: *mut c_int, patch: *mut c_int) -> c_int;

src/error.rs

@@ -1,12 +1,12 @@
 extern crate libc;
 
 use std::ops::{Deref, DerefMut};
-use defines::AfError;
+use crate::defines::AfError;
 use self::libc::{c_int, c_char};
 use std::ffi::CStr;
 use std::error::Error;
 use std::sync::RwLock;
-use util::{DimT, free_host, MutDimT};
+use crate::util::{DimT, free_host, MutDimT};
 
 #[allow(dead_code)]
 extern {

src/graphics.rs

@@ -1,13 +1,13 @@
 extern crate libc;
 
-use array::Array;
-use defines::AfError;
-use defines::{ColorMap, MarkerType};
-use error::HANDLE_ERROR;
+use crate::array::Array;
+use crate::defines::AfError;
+use crate::defines::{ColorMap, MarkerType};
+use crate::error::HANDLE_ERROR;
 use self::libc::{c_int, c_uint, c_float, c_double, c_char};
 use std::ffi::CString;
 use std::ptr;
-use util::{AfArray, CellPtr, HasAfEnum, MutWndHandle, WndHandle};
+use crate::util::{AfArray, CellPtr, HasAfEnum, MutWndHandle, WndHandle};
 
 #[allow(dead_code)]
 extern {

src/image/mod.rs

@@ -1,12 +1,12 @@
 extern crate libc;
 
-use array::Array;
-use defines::{AfError, BorderType, CannyThresholdType, ColorSpace, Connectivity};
-use defines::{DiffusionEq, FluxFn, InterpType, MomentType, YCCStd};
-use error::HANDLE_ERROR;
-use util::{AfArray, DimT, MutAfArray};
-use util::{FloatingPoint, HasAfEnum, RealNumber, ImageNativeType, ImageFilterType};
-use util::{RealFloating, EdgeComputable, MomentsComputable, GrayRGBConvertible};
+use crate::array::Array;
+use crate::defines::{AfError, BorderType, CannyThresholdType, ColorSpace, Connectivity};
+use crate::defines::{DiffusionEq, FluxFn, InterpType, MomentType, YCCStd};
+use crate::error::HANDLE_ERROR;
+use crate::util::{AfArray, DimT, MutAfArray};
+use crate::util::{FloatingPoint, HasAfEnum, RealNumber, ImageNativeType, ImageFilterType};
+use crate::util::{RealFloating, EdgeComputable, MomentsComputable, GrayRGBConvertible};
 use self::libc::{c_uint, c_int, c_float, c_double, c_char};
 use std::ffi::CString;
 

src/index.rs

@@ -1,11 +1,11 @@
 extern crate libc;
 
-use array::Array;
-use defines::AfError;
-use error::HANDLE_ERROR;
-use seq::Seq;
+use crate::array::Array;
+use crate::defines::AfError;
+use crate::error::HANDLE_ERROR;
+use crate::seq::Seq;
 use self::libc::{c_double, c_int, c_uint};
-use util::{AfArray, AfIndex, DimT, HasAfEnum, MutAfArray, MutAfIndex};
+use crate::util::{AfArray, AfIndex, DimT, HasAfEnum, MutAfArray, MutAfIndex};
 
 use std::marker::PhantomData;
 

src/lapack/mod.rs

@@ -1,10 +1,10 @@
 extern crate libc;
 
-use array::Array;
-use defines::{AfError, MatProp, NormType};
-use error::HANDLE_ERROR;
-use util::{AfArray, MutAfArray, MutDouble, to_u32};
-use util::{FloatingPoint, HasAfEnum};
+use crate::array::Array;
+use crate::defines::{AfError, MatProp, NormType};
+use crate::error::HANDLE_ERROR;
+use crate::util::{AfArray, MutAfArray, MutDouble, to_u32};
+use crate::util::{FloatingPoint, HasAfEnum};
 use self::libc::{c_int, c_uint, c_double};
 
 #[allow(dead_code)]