|
19 | 19 | use std::ops::DerefMut;
|
20 | 20 |
|
21 | 21 | use base64::{
|
22 |
| - alphabet, |
23 |
| - engine::{general_purpose, GeneralPurpose}, |
24 |
| - Engine, |
| 22 | + Engine, alphabet, |
| 23 | + engine::{GeneralPurpose, general_purpose}, |
25 | 24 | };
|
26 |
| -use blake3::{derive_key, Hash}; |
| 25 | +use blake3::{Hash, derive_key}; |
27 | 26 | use chacha20poly1305::{
|
28 |
| - aead::{Aead, Error as EncryptionError}, |
29 | 27 | Key as ChachaKey, KeyInit, XChaCha20Poly1305, XNonce,
|
| 28 | + aead::{Aead, Error as EncryptionError}, |
30 | 29 | };
|
31 | 30 | use hmac::Hmac;
|
32 | 31 | use pbkdf2::pbkdf2;
|
33 |
| -use rand::{thread_rng, Error as RandomError, Fill}; |
34 |
| -use serde::{de::DeserializeOwned, Deserialize, Serialize}; |
| 32 | +use rand::{Error as RandomError, Fill, thread_rng}; |
| 33 | +use serde::{Deserialize, Serialize, de::DeserializeOwned}; |
35 | 34 | use sha2::Sha256;
|
36 | 35 | use zeroize::{Zeroize, ZeroizeOnDrop};
|
37 | 36 |
|
@@ -815,7 +814,7 @@ struct EncryptedStoreCipher {
|
815 | 814 |
|
816 | 815 | #[cfg(test)]
|
817 | 816 | mod tests {
|
818 |
| - use serde_json::{json, Value}; |
| 817 | + use serde_json::{Value, json}; |
819 | 818 |
|
820 | 819 | use super::{Error, StoreCipher};
|
821 | 820 | use crate::{EncryptedValue, EncryptedValueBase64, EncryptedValueBase64DecodeError};
|
|
0 commit comments