Merge pull request #113 from Eirik0/edition-2018-clean-up

Edition 2018 clean up

librustzcash/Cargo.toml

@@ -6,7 +6,8 @@ authors = [
     "Jack Grigg <jack@z.cash>",
     "Jay Graber <jay@z.cash>",
     "Simon Liu <simon@z.cash>"
-    ]
+]
+edition = "2018"
 
 [lib]
 name = "rustzcash"

librustzcash/src/rustzcash.rs

@@ -1,16 +1,4 @@
-extern crate bellman;
-extern crate blake2b_simd;
-extern crate blake2s_simd;
-extern crate byteorder;
-extern crate ff;
-extern crate libc;
-extern crate pairing;
-extern crate rand_core;
-extern crate rand_os;
-extern crate zcash_primitives;
-extern crate zcash_proofs;
-
-extern crate lazy_static;
+use lazy_static;
 
 use ff::{PrimeField, PrimeFieldRepr};
 use pairing::bls12_381::{Bls12, Fr, FrRepr};

librustzcash/src/tests/key_agreement.rs

@@ -5,7 +5,7 @@ use rand_os::OsRng;
 use zcash_primitives::jubjub::{edwards, JubjubBls12};
 use zcash_primitives::primitives::{Diversifier, ViewingKey};
 
-use {
+use crate::{
     librustzcash_sapling_generate_r, librustzcash_sapling_ka_agree,
     librustzcash_sapling_ka_derivepublic,
 };

librustzcash/src/tests/key_components.rs

@@ -7,7 +7,7 @@ use zcash_primitives::{
 
 use super::JUBJUB;
 
-use {
+use crate::{
     librustzcash_ask_to_ak, librustzcash_check_diversifier, librustzcash_crh_ivk,
     librustzcash_ivk_to_pkd, librustzcash_nsk_to_nk,
 };

librustzcash/src/tests/notes.rs

@@ -1,5 +1,5 @@
-use librustzcash_sapling_compute_cm;
-use librustzcash_sapling_compute_nf;
+use crate::librustzcash_sapling_compute_cm;
+use crate::librustzcash_sapling_compute_nf;
 
 #[test]
 fn notes() {