Skip to content

Fix Rust 1.89 compiler warnings in slasher tests. #7844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 1 commit into from
Aug 8, 2025
Merged

Fix Rust 1.89 compiler warnings in slasher tests. #7844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions slasher/src/database/mdbx_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl Environment {
Ok(Environment { env })
}

pub fn create_databases(&self) -> Result<OpenDatabases, Error> {
pub fn create_databases(&self) -> Result<OpenDatabases<'_>, Error> {
let txn = self.begin_rw_txn()?;
txn.create_db(INDEXED_ATTESTATION_DB)?;
txn.create_db(INDEXED_ATTESTATION_ID_DB)?;
Expand Down Expand Up @@ -77,7 +77,7 @@ impl Environment {
})
}

pub fn begin_rw_txn(&self) -> Result<RwTransaction, Error> {
pub fn begin_rw_txn(&self) -> Result<RwTransaction<'_>, Error> {
let txn = self.env.begin_rw_txn()?;
Ok(RwTransaction { txn })
}
Expand Down Expand Up @@ -106,7 +106,7 @@ impl<'env> RwTransaction<'env> {
Ok(())
}

pub fn open_db(&self, name: &'static str) -> Result<Database, Error> {
pub fn open_db(&self, name: &'static str) -> Result<Database<'_>, Error> {
let db = self.txn.open_db(Some(name))?;
Ok(Database { db })
}
Expand Down
6 changes: 3 additions & 3 deletions slasher/src/database/redb_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl Environment {
})
}

pub fn create_databases(&self) -> Result<OpenDatabases, Error> {
pub fn create_databases(&self) -> Result<OpenDatabases<'_>, Error> {
let indexed_attestation_db = self.create_table(INDEXED_ATTESTATION_DB)?;
let indexed_attestation_id_db = self.create_table(INDEXED_ATTESTATION_ID_DB)?;
let attesters_db = self.create_table(ATTESTERS_DB)?;
Expand Down Expand Up @@ -94,7 +94,7 @@ impl Environment {
vec![config.database_path.join(REDB_DATA_FILENAME)]
}

pub fn begin_rw_txn(&self) -> Result<RwTransaction, Error> {
pub fn begin_rw_txn(&self) -> Result<RwTransaction<'_>, Error> {
let mut txn = self.db.begin_write()?;
txn.set_durability(redb::Durability::Eventual);
Ok(RwTransaction {
Expand Down Expand Up @@ -160,7 +160,7 @@ impl<'env> RwTransaction<'env> {
}

impl<'env> Cursor<'env> {
pub fn first_key(&mut self) -> Result<Option<Key>, Error> {
pub fn first_key(&mut self) -> Result<Option<Key<'_>>, Error> {
let table_definition: TableDefinition<'_, &[u8], &[u8]> =
TableDefinition::new(&self.db.table_name);
let table = self.txn.open_table(table_definition)?;
Expand Down