From 081d55962ae47112cbfc217a9b579cb0cd145abe Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Sat, 15 Jun 2024 19:21:34 +0200
Subject: [PATCH] chore: touchups

---
 crates/primitives/src/chain/spec.rs            | 18 ++++++++----------
 crates/primitives/src/transaction/legacy.rs    |  3 +--
 crates/primitives/src/transaction/signature.rs |  3 +--
 crates/primitives/src/transaction/variant.rs   |  1 -
 crates/primitives/src/withdrawal.rs            | 10 ++++------
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/crates/primitives/src/chain/spec.rs b/crates/primitives/src/chain/spec.rs
index e31b289f00e13..cd8bb5560d65d 100644
--- a/crates/primitives/src/chain/spec.rs
+++ b/crates/primitives/src/chain/spec.rs
@@ -10,20 +10,14 @@ use crate::{
     Hardfork, Head, Header, NamedChain, NodeRecord, SealedHeader, B256, EMPTY_OMMER_ROOT_HASH,
     MAINNET_DEPOSIT_CONTRACT, U256,
 };
-use derive_more::From;
-use once_cell::sync::Lazy;
-use reth_trie_common::root::state_root_ref_unhashed;
-use serde::{Deserialize, Serialize};
-
-#[cfg(feature = "std")]
-use std::{collections::BTreeMap, sync::Arc};
-
-pub use alloy_eips::eip1559::BaseFeeParams;
-
 use core::{
     fmt,
     fmt::{Display, Formatter},
 };
+use derive_more::From;
+use once_cell::sync::Lazy;
+use reth_trie_common::root::state_root_ref_unhashed;
+use serde::{Deserialize, Serialize};
 
 #[cfg(not(feature = "std"))]
 use alloc::{
@@ -33,6 +27,10 @@ use alloc::{
     sync::Arc,
     vec::Vec,
 };
+#[cfg(feature = "std")]
+use std::{collections::BTreeMap, sync::Arc};
+
+pub use alloy_eips::eip1559::BaseFeeParams;
 
 #[cfg(feature = "optimism")]
 pub(crate) use crate::{
diff --git a/crates/primitives/src/transaction/legacy.rs b/crates/primitives/src/transaction/legacy.rs
index 56397a91d39af..ebbe29a78c1e8 100644
--- a/crates/primitives/src/transaction/legacy.rs
+++ b/crates/primitives/src/transaction/legacy.rs
@@ -1,9 +1,8 @@
 use crate::{keccak256, Bytes, ChainId, Signature, TxKind, TxType, B256, U256};
 use alloy_rlp::{length_of_length, Encodable, Header};
 use bytes::BytesMut;
-use reth_codecs::{main_codec, Compact};
-
 use core::mem;
+use reth_codecs::{main_codec, Compact};
 
 /// Legacy transaction.
 #[main_codec]
diff --git a/crates/primitives/src/transaction/signature.rs b/crates/primitives/src/transaction/signature.rs
index 48f243d45ef67..077858a3c579a 100644
--- a/crates/primitives/src/transaction/signature.rs
+++ b/crates/primitives/src/transaction/signature.rs
@@ -2,7 +2,6 @@ use crate::{transaction::util::secp256k1, Address, B256, U256};
 use alloy_primitives::Bytes;
 use alloy_rlp::{Decodable, Encodable, Error as RlpError};
 use bytes::Buf;
-use core::mem;
 use reth_codecs::{derive_arbitrary, Compact};
 use serde::{Deserialize, Serialize};
 
@@ -194,7 +193,7 @@ impl Signature {
     /// Calculates a heuristic for the in-memory size of the [Signature].
     #[inline]
     pub const fn size(&self) -> usize {
-        mem::size_of::<Self>()
+        core::mem::size_of::<Self>()
     }
 }
 
diff --git a/crates/primitives/src/transaction/variant.rs b/crates/primitives/src/transaction/variant.rs
index 021ff4586b868..5bff5215d7ac3 100644
--- a/crates/primitives/src/transaction/variant.rs
+++ b/crates/primitives/src/transaction/variant.rs
@@ -5,7 +5,6 @@ use crate::{
     Address, Transaction, TransactionSigned, TransactionSignedEcRecovered, TransactionSignedNoHash,
     B256,
 };
-
 use core::ops::Deref;
 
 /// Represents various different transaction formats used in reth.
diff --git a/crates/primitives/src/withdrawal.rs b/crates/primitives/src/withdrawal.rs
index 34df40be7a417..f5bff63bc3cca 100644
--- a/crates/primitives/src/withdrawal.rs
+++ b/crates/primitives/src/withdrawal.rs
@@ -7,8 +7,6 @@ use reth_codecs::{main_codec, Compact};
 #[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 
-use core::{mem, slice};
-
 /// Re-export from `alloy_eips`.
 #[doc(inline)]
 pub use alloy_eips::eip4895::Withdrawal;
@@ -42,22 +40,22 @@ impl Withdrawals {
     /// Calculate the total size, including capacity, of the Withdrawals.
     #[inline]
     pub fn total_size(&self) -> usize {
-        self.capacity() * mem::size_of::<Withdrawal>()
+        self.capacity() * size_of::<Withdrawal>()
     }
 
     /// Calculate a heuristic for the in-memory size of the [Withdrawals].
     #[inline]
     pub fn size(&self) -> usize {
-        self.len() * mem::size_of::<Withdrawal>()
+        self.len() * size_of::<Withdrawal>()
     }
 
     /// Get an iterator over the Withdrawals.
-    pub fn iter(&self) -> slice::Iter<'_, Withdrawal> {
+    pub fn iter(&self) -> core::slice::Iter<'_, Withdrawal> {
         self.0.iter()
     }
 
     /// Get a mutable iterator over the Withdrawals.
-    pub fn iter_mut(&mut self) -> slice::IterMut<'_, Withdrawal> {
+    pub fn iter_mut(&mut self) -> core::slice::IterMut<'_, Withdrawal> {
         self.0.iter_mut()
     }