Migrate import statements and macros to Rust 2018.

src/ctap/command.rs

@@ -21,6 +21,7 @@ use super::data_formats::{
 use super::status_code::Ctap2StatusCode;
 use alloc::string::String;
 use alloc::vec::Vec;
+use cbor::destructure_cbor_map;
 use core::convert::TryFrom;
 
 // Depending on your memory, you can use Some(n) to limit request sizes in
@@ -383,6 +384,7 @@ mod test {
     use super::super::ES256_CRED_PARAM;
     use super::*;
     use alloc::collections::BTreeMap;
+    use cbor::{cbor_array, cbor_map};
 
     #[test]
     fn test_from_cbor_make_credential_parameters() {

src/ctap/ctap1.rs

@@ -17,6 +17,7 @@ use super::key_material::{ATTESTATION_CERTIFICATE, ATTESTATION_PRIVATE_KEY};
 use super::status_code::Ctap2StatusCode;
 use super::CtapState;
 use alloc::vec::Vec;
+use arrayref::array_ref;
 use core::convert::Into;
 use core::convert::TryFrom;
 use crypto::rng256::Rng256;

src/ctap/data_formats.rs

@@ -16,6 +16,8 @@ use super::status_code::Ctap2StatusCode;
 use alloc::collections::BTreeMap;
 use alloc::string::String;
 use alloc::vec::Vec;
+use arrayref::array_ref;
+use cbor::{cbor_array_vec, cbor_bytes_lit, cbor_map_options, destructure_cbor_map};
 use core::convert::TryFrom;
 use crypto::{ecdh, ecdsa};
 #[cfg(test)]
@@ -800,6 +802,10 @@ mod test {
     use self::Ctap2StatusCode::CTAP2_ERR_CBOR_UNEXPECTED_TYPE;
     use super::*;
     use alloc::collections::BTreeMap;
+    use cbor::{
+        cbor_array, cbor_bool, cbor_bytes, cbor_false, cbor_int, cbor_map, cbor_null, cbor_text,
+        cbor_unsigned,
+    };
     use crypto::rng256::{Rng256, ThreadRng256};
 
     #[test]

src/ctap/hid/mod.rs

@@ -22,7 +22,9 @@ use super::ctap1;
 use super::status_code::Ctap2StatusCode;
 use super::timed_permission::TimedPermission;
 use super::CtapState;
+use alloc::vec;
 use alloc::vec::Vec;
+use arrayref::{array_ref, array_refs};
 #[cfg(feature = "debug_ctap")]
 use core::fmt::Write;
 use crypto::rng256::Rng256;

src/ctap/mod.rs

@@ -51,8 +51,11 @@ use self::storage::PersistentStore;
 use self::timed_permission::U2fUserPresenceState;
 use alloc::collections::BTreeMap;
 use alloc::string::{String, ToString};
+use alloc::vec;
 use alloc::vec::Vec;
+use arrayref::array_ref;
 use byteorder::{BigEndian, ByteOrder};
+use cbor::{cbor_map, cbor_map_options};
 #[cfg(feature = "debug_ctap")]
 use core::fmt::Write;
 use crypto::cbc::{cbc_decrypt, cbc_encrypt};

src/ctap/pin_protocol_v1.rs

@@ -19,7 +19,10 @@ use super::status_code::Ctap2StatusCode;
 use super::storage::PersistentStore;
 #[cfg(feature = "with_ctap2_1")]
 use alloc::string::String;
+#[cfg(feature = "with_ctap2_1")]
+use alloc::vec;
 use alloc::vec::Vec;
+use arrayref::array_ref;
 use core::convert::TryInto;
 use crypto::cbc::{cbc_decrypt, cbc_encrypt};
 use crypto::hmac::{hmac_256, verify_hmac_256_first_128bits};
@@ -635,6 +638,7 @@ impl PinProtocolV1 {
 #[cfg(test)]
 mod test {
     use super::*;
+    use arrayref::array_refs;
     use crypto::rng256::ThreadRng256;
 
     // Stores a PIN hash corresponding to the dummy PIN "1234".

src/ctap/response.rs

@@ -21,6 +21,7 @@ use super::data_formats::{
 use alloc::collections::BTreeMap;
 use alloc::string::String;
 use alloc::vec::Vec;
+use cbor::{cbor_array_vec, cbor_bool, cbor_map_btree, cbor_map_options, cbor_text};
 
 #[cfg_attr(test, derive(PartialEq))]
 #[cfg_attr(any(test, feature = "debug_ctap"), derive(Debug))]
@@ -236,6 +237,7 @@ mod test {
     #[cfg(feature = "with_ctap2_1")]
     use super::super::ES256_CRED_PARAM;
     use super::*;
+    use cbor::{cbor_bytes, cbor_map};
 
     #[test]
     fn test_make_credential_into_cbor() {

src/ctap/storage.rs

@@ -20,7 +20,12 @@ use crate::ctap::status_code::Ctap2StatusCode;
 use crate::ctap::{key_material, USE_BATCH_ATTESTATION};
 use crate::embedded_flash::{self, StoreConfig, StoreEntry, StoreError};
 use alloc::string::String;
+#[cfg(any(test, feature = "ram_storage", feature = "with_ctap2_1"))]
+use alloc::vec;
 use alloc::vec::Vec;
+use arrayref::array_ref;
+#[cfg(feature = "with_ctap2_1")]
+use cbor::cbor_array_vec;
 use core::convert::TryInto;
 use crypto::rng256::Rng256;