Migrate import statements and macros to Rust 2018.

libraries/crypto/src/aes256.rs

@@ -14,6 +14,7 @@
 
 use super::util::{xor_block_16, Block16};
 use super::{Decrypt16BytesBlock, Encrypt16BytesBlock};
+use arrayref::{array_mut_ref, array_ref};
 
 /** A portable and naive textbook implementation of AES-256 **/
 type Word = [u8; 4];

libraries/crypto/src/ec/int256.rs

@@ -13,7 +13,9 @@
 // limitations under the License.
 
 use super::super::rng256::Rng256;
+use alloc::vec;
 use alloc::vec::Vec;
+use arrayref::{array_mut_ref, array_ref};
 use byteorder::{BigEndian, ByteOrder};
 use core::ops::{Add, AddAssign, Sub, SubAssign};
 use subtle::{self, Choice, ConditionallySelectable, ConstantTimeEq};

libraries/crypto/src/ec/point.rs

@@ -16,6 +16,10 @@ use super::exponent256::ExponentP256;
 use super::gfp256::GFP256;
 use super::int256::Int256;
 use super::montgomery::Montgomery;
+#[cfg(test)]
+use arrayref::array_mut_ref;
+#[cfg(feature = "std")]
+use arrayref::array_ref;
 use core::ops::Add;
 use subtle::{Choice, ConditionallySelectable, ConstantTimeEq};
 

libraries/crypto/src/ecdsa.rs

@@ -19,7 +19,12 @@ use super::ec::point::PointP256;
 use super::hmac::hmac_256;
 use super::rng256::Rng256;
 use super::{Hash256, HashBlockSize64Bytes};
+use alloc::vec;
 use alloc::vec::Vec;
+#[cfg(feature = "std")]
+use arrayref::array_ref;
+use arrayref::{array_mut_ref, mut_array_refs};
+use cbor::{cbor_bytes, cbor_map_options};
 use core::marker::PhantomData;
 
 #[derive(Clone, PartialEq)]
@@ -349,9 +354,6 @@ mod test {
     use super::super::rng256::ThreadRng256;
     use super::super::sha256::Sha256;
     use super::*;
-    extern crate hex;
-    extern crate ring;
-    extern crate untrusted;
 
     // Run more test iterations in release mode, as the code should be faster.
     #[cfg(not(debug_assertions))]

libraries/crypto/src/hmac.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use super::{Hash256, HashBlockSize64Bytes};
+use arrayref::array_ref;
 use subtle::ConstantTimeEq;
 
 const BLOCK_SIZE: usize = 64;
@@ -71,7 +72,6 @@ fn xor_pads(ipad: &mut [u8; BLOCK_SIZE], opad: &mut [u8; BLOCK_SIZE], key: &[u8]
 mod test {
     use super::super::sha256::Sha256;
     use super::*;
-    extern crate hex;
 
     #[test]
     fn test_verify_hmac_valid() {

libraries/crypto/src/lib.rs

@@ -15,14 +15,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![feature(wrapping_int_impl)]
 
-#[macro_use]
 extern crate alloc;
-extern crate subtle;
-#[macro_use]
-extern crate arrayref;
-extern crate byteorder;
-#[macro_use]
-extern crate cbor;
 
 pub mod aes256;
 pub mod cbc;

libraries/crypto/src/rng256.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use arrayref::array_ref;
 use libtock_drivers::rng;
 
 // Lightweight RNG trait to generate uniformly distributed 256 bits.

libraries/crypto/src/sha256.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use super::{Hash256, HashBlockSize64Bytes};
+use arrayref::{array_mut_ref, array_ref};
 use byteorder::{BigEndian, ByteOrder};
 use core::num::Wrapping;
 
@@ -210,7 +211,6 @@ impl Sha256 {
 #[cfg(test)]
 mod test {
     use super::*;
-    extern crate hex;
 
     #[test]
     fn test_choice() {

libraries/crypto/tests/aesavs.rs

@@ -15,11 +15,7 @@
 /// Test vectors for AES-ECB from NIST's validation suite.
 ///
 /// See also https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Algorithm-Validation-Program/documents/aes/AESAVS.pdf
-#[macro_use]
-extern crate arrayref;
-extern crate hex;
-extern crate regex;
-
+use arrayref::array_ref;
 use crypto::{aes256, Decrypt16BytesBlock, Encrypt16BytesBlock};
 use regex::Regex;
 use std::fs::File;