Skip to content

Commit

Permalink
Fix merge conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
emhane committed Oct 5, 2024
1 parent e0a54a0 commit 45f9b4e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crates/primitives/src/transaction/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,7 @@ pub mod serde_bincode_compat {
}
}

impl<'a> SerializeAs<super::Transaction> for Transaction<'a> {
impl SerializeAs<super::Transaction> for Transaction<'_> {
fn serialize_as<S>(source: &super::Transaction, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
Expand Down Expand Up @@ -1701,7 +1701,7 @@ pub mod serde_bincode_compat {
}
}

impl<'a> SerializeAs<super::TransactionSigned> for TransactionSigned<'a> {
impl SerializeAs<super::TransactionSigned> for TransactionSigned<'_> {
fn serialize_as<S>(
source: &super::TransactionSigned,
serializer: S,
Expand Down

0 comments on commit 45f9b4e

Please sign in to comment.