Skip to content

Commit af2c52c

Browse files
committed
lifetimes bump
1 parent def8c07 commit af2c52c

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

crates/context/src/journal/inner.rs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -566,13 +566,13 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
566566

567567
/// Loads account into memory. return if it is cold or warm accessed
568568
#[inline]
569-
pub fn load_account<'a, 'b, DB: Database>(
569+
pub fn load_account<'a, 'db, DB: Database>(
570570
&'a mut self,
571-
db: &'b mut DB,
571+
db: &'db mut DB,
572572
address: Address,
573573
) -> Result<StateLoad<&'a Account>, DB::Error>
574574
where
575-
'b: 'a,
575+
'db: 'a,
576576
{
577577
self.load_account_optional(db, address, false, false)
578578
.map_err(JournalLoadError::unwrap_db_error)
@@ -625,29 +625,29 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
625625
/// In case of EIP-7702 delegated account will not be loaded,
626626
/// [`Self::load_account_delegated`] should be used instead.
627627
#[inline]
628-
pub fn load_code<'a, 'b, DB: Database>(
628+
pub fn load_code<'a, 'db, DB: Database>(
629629
&'a mut self,
630-
db: &'a mut DB,
630+
db: &'db mut DB,
631631
address: Address,
632632
) -> Result<StateLoad<&'a Account>, DB::Error>
633633
where
634-
'b: 'a,
634+
'db: 'a,
635635
{
636636
self.load_account_optional(db, address, true, false)
637637
.map_err(JournalLoadError::unwrap_db_error)
638638
}
639639

640640
/// Loads account into memory. If account is already loaded it will be marked as warm.
641641
#[inline]
642-
pub fn load_account_optional<'a, 'b, DB: Database>(
642+
pub fn load_account_optional<'a, 'db, DB: Database>(
643643
&'a mut self,
644-
db: &'a mut DB,
644+
db: &'db mut DB,
645645
address: Address,
646646
load_code: bool,
647647
skip_cold_load: bool,
648648
) -> Result<StateLoad<&'a Account>, JournalLoadError<DB::Error>>
649649
where
650-
'b: 'a,
650+
'db: 'a,
651651
{
652652
let mut load = self.load_account_mut_optional(db, address, skip_cold_load)?;
653653
if load_code {
@@ -658,29 +658,29 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
658658

659659
/// Loads account into memory. If account is already loaded it will be marked as warm.
660660
#[inline]
661-
pub fn load_account_mut<'a, 'b, DB: Database>(
661+
pub fn load_account_mut<'a, 'db, DB: Database>(
662662
&'a mut self,
663-
db: &'b mut DB,
663+
db: &'db mut DB,
664664
address: Address,
665665
) -> Result<StateLoad<JournaledAccount<'a, DB, ENTRY>>, DB::Error>
666666
where
667-
'b: 'a,
667+
'db: 'a,
668668
{
669669
self.load_account_mut_optional(db, address, false)
670670
.map_err(JournalLoadError::unwrap_db_error)
671671
}
672672

673673
/// Loads account. If account is already loaded it will be marked as warm.
674674
#[inline]
675-
pub fn load_account_mut_optional_code<'a, 'b, DB: Database>(
675+
pub fn load_account_mut_optional_code<'a, 'db, DB: Database>(
676676
&'a mut self,
677-
db: &'b mut DB,
677+
db: &'db mut DB,
678678
address: Address,
679679
load_code: bool,
680680
skip_cold_load: bool,
681681
) -> Result<StateLoad<JournaledAccount<'a, DB, ENTRY>>, JournalLoadError<DB::Error>>
682682
where
683-
'b: 'a,
683+
'db: 'a,
684684
{
685685
let mut load = self.load_account_mut_optional(db, address, skip_cold_load)?;
686686
if load_code {
@@ -697,13 +697,13 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
697697
/// It will not bump transition_id or return if it is cold or warm loaded. This function is useful
698698
/// when we know account is warm, touched and already loaded.
699699
#[inline]
700-
pub fn load_account_mut_unsafe<'a, 'b, DB: Database>(
700+
pub fn load_account_mut_unsafe<'a, 'db, DB: Database>(
701701
&'a mut self,
702-
db: &'b mut DB,
702+
db: &'db mut DB,
703703
address: Address,
704704
) -> Option<JournaledAccount<'a, DB, ENTRY>>
705705
where
706-
'b: 'a,
706+
'db: 'a,
707707
{
708708
let account = self.state.get_mut(&address)?;
709709
Some(JournaledAccount::new(
@@ -717,14 +717,14 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
717717
}
718718
/// Loads account. If account is already loaded it will be marked as warm.
719719
#[inline(never)]
720-
pub fn load_account_mut_optional<'a, 'b, DB: Database>(
720+
pub fn load_account_mut_optional<'a, 'db, DB: Database>(
721721
&'a mut self,
722-
db: &'b mut DB,
722+
db: &'db mut DB,
723723
address: Address,
724724
skip_cold_load: bool,
725725
) -> Result<StateLoad<JournaledAccount<'a, DB, ENTRY>>, JournalLoadError<DB::Error>>
726726
where
727-
'b: 'a,
727+
'db: 'a,
728728
{
729729
let (account, is_cold) = match self.state.entry(address) {
730730
Entry::Occupied(entry) => {

0 commit comments

Comments
 (0)