From 047fd9eced92f09039eb900e235729b061371ee2 Mon Sep 17 00:00:00 2001 From: Shun Sakai Date: Fri, 26 Jul 2024 08:58:46 +0900 Subject: [PATCH] style: Shorten paths --- crates/scryptenc/src/decrypt.rs | 4 ++-- crates/scryptenc/src/format.rs | 5 +---- crates/scryptenc/src/params.rs | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/crates/scryptenc/src/decrypt.rs b/crates/scryptenc/src/decrypt.rs index e2f2800..ac1f77f 100644 --- a/crates/scryptenc/src/decrypt.rs +++ b/crates/scryptenc/src/decrypt.rs @@ -8,9 +8,9 @@ use aes::cipher::{generic_array::GenericArray, KeyIvInit, StreamCipher}; use hmac::Mac; use crate::{ - error::{Error, Result}, format::{DerivedKey, Header}, - Aes256Ctr128BE, HmacSha256, HmacSha256Key, HmacSha256Output, HEADER_SIZE, TAG_SIZE, + Aes256Ctr128BE, Error, HmacSha256, HmacSha256Key, HmacSha256Output, Result, HEADER_SIZE, + TAG_SIZE, }; /// Decryptor for the scrypt encrypted data format. diff --git a/crates/scryptenc/src/format.rs b/crates/scryptenc/src/format.rs index 84e0cfa..1240e47 100644 --- a/crates/scryptenc/src/format.rs +++ b/crates/scryptenc/src/format.rs @@ -17,10 +17,7 @@ use hmac::{ use rand::{rngs::StdRng, Rng, SeedableRng}; use sha2::{Digest, Sha256}; -use crate::{ - error::{Error, Result}, - Aes256Ctr128BE, HmacSha256, HmacSha256Key, HmacSha256Output, Params, -}; +use crate::{Aes256Ctr128BE, Error, HmacSha256, HmacSha256Key, HmacSha256Output, Params, Result}; /// A type alias for magic number of the scrypt encrypted data format. type MagicNumber = [u8; 6]; diff --git a/crates/scryptenc/src/params.rs b/crates/scryptenc/src/params.rs index 695b4cc..6f1c465 100644 --- a/crates/scryptenc/src/params.rs +++ b/crates/scryptenc/src/params.rs @@ -4,7 +4,7 @@ //! The scrypt parameters. -use crate::{error::Result, format::Header}; +use crate::{format::Header, Result}; /// The scrypt parameters used for the encrypted data. #[derive(Clone, Copy, Debug)]