reformat workspace according to edition 2024

Author: baloo

belt-mac/src/lib.rs

@@ -14,17 +14,17 @@ use belt_block::BeltBlock;
 use cipher::{BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt};
 use core::fmt;
 use digest::{
+    MacMarker, Output, OutputSizeUser, Reset,
     array::{
-        typenum::{IsLess, Le, NonZero, U256},
         Array, ArraySize,
+        typenum::{IsLess, Le, NonZero, U256},
     },
     block_buffer::Lazy,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         UpdateCore,
     },
     crypto_common::{BlockSizes, InnerInit, InnerUser},
-    MacMarker, Output, OutputSizeUser, Reset,
 };
 
 #[cfg(feature = "zeroize")]

cbc-mac/src/lib.rs

@@ -38,17 +38,17 @@ pub use digest::{self, KeyInit, Mac};
 use cipher::{BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt};
 use core::fmt;
 use digest::{
+    MacMarker, Output, OutputSizeUser, Reset,
     array::{
-        typenum::{IsLess, Le, NonZero, U256},
         Array, ArraySize,
+        typenum::{IsLess, Le, NonZero, U256},
     },
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         UpdateCore,
     },
     crypto_common::{BlockSizes, InnerInit, InnerUser},
-    MacMarker, Output, OutputSizeUser, Reset,
 };
 
 #[cfg(feature = "zeroize")]

cmac/src/lib.rs

@@ -54,17 +54,17 @@ use cipher::{BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt};
 use core::fmt;
 use dbl::Dbl;
 use digest::{
+    MacMarker, Output, OutputSizeUser, Reset,
     array::{
-        typenum::{IsLess, Le, NonZero, U256},
         Array, ArraySize,
+        typenum::{IsLess, Le, NonZero, U256},
     },
     block_buffer::Lazy,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         UpdateCore,
     },
     crypto_common::{BlockSizes, InnerInit, InnerUser},
-    MacMarker, Output, OutputSizeUser, Reset,
 };
 
 #[cfg(feature = "zeroize")]

hmac/src/lib.rs

@@ -96,8 +96,8 @@ extern crate std;
 pub use digest::{self, KeyInit, Mac};
 
 use digest::{
-    core_api::{Block, BlockSizeUser},
     Digest,
+    core_api::{Block, BlockSizeUser},
 };
 
 mod optim;

hmac/src/optim.rs

@@ -1,13 +1,13 @@
-use super::{get_der_key, IPAD, OPAD};
+use super::{IPAD, OPAD, get_der_key};
 use core::{fmt, slice};
 use digest::{
+    HashMarker, InvalidLength, KeyInit, MacMarker, Output,
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         OutputSizeUser, UpdateCore,
     },
     crypto_common::{Key, KeySizeUser},
-    HashMarker, InvalidLength, KeyInit, MacMarker, Output,
 };
 
 /// Generic HMAC instance.

hmac/src/simple.rs

@@ -1,8 +1,8 @@
-use super::{get_der_key, IPAD, OPAD};
+use super::{IPAD, OPAD, get_der_key};
 use core::fmt;
 use digest::{
-    crypto_common::{Block, BlockSizeUser, InvalidLength, Key, KeySizeUser},
     Digest, FixedOutput, KeyInit, MacMarker, Output, OutputSizeUser, Update,
+    crypto_common::{Block, BlockSizeUser, InvalidLength, Key, KeySizeUser},
 };
 #[cfg(feature = "reset")]
 use digest::{FixedOutputReset, Reset};

pmac/src/lib.rs

@@ -57,17 +57,17 @@ use cipher::{BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, P
 use core::fmt;
 use dbl::Dbl;
 use digest::{
+    MacMarker, Output, OutputSizeUser, Reset,
     array::{
-        typenum::{IsLess, Le, NonZero, Unsigned, U256},
         Array, ArraySize,
+        typenum::{IsLess, Le, NonZero, U256, Unsigned},
     },
     block_buffer::Lazy,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         UpdateCore,
     },
     crypto_common::{BlockSizes, InnerInit, InnerUser},
-    MacMarker, Output, OutputSizeUser, Reset,
 };
 
 #[cfg(feature = "zeroize")]

retail-mac/src/lib.rs

@@ -48,17 +48,17 @@ use cipher::{
 };
 use core::fmt;
 use digest::{
+    MacMarker, Output, OutputSizeUser, Reset,
     array::{
-        typenum::{IsLess, Le, NonZero, U2, U256},
         Array, ArraySize,
+        typenum::{IsLess, Le, NonZero, U2, U256},
     },
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         UpdateCore,
     },
     crypto_common::BlockSizes,
-    MacMarker, Output, OutputSizeUser, Reset,
 };
 
 #[cfg(feature = "zeroize")]