diff --git a/clarity/src/vm/analysis/type_checker/contexts.rs b/clarity/src/vm/analysis/type_checker/contexts.rs index 356ebf59442..4a67ab768ed 100644 --- a/clarity/src/vm/analysis/type_checker/contexts.rs +++ b/clarity/src/vm/analysis/type_checker/contexts.rs @@ -104,7 +104,7 @@ impl TypingContext<'_> { } } - pub fn extend(&self) -> CheckResult { + pub fn extend(&self) -> CheckResult> { if self.depth >= MAX_CONTEXT_DEPTH { Err(CheckError::new(CheckErrors::MaxContextDepthReached)) } else { diff --git a/clarity/src/vm/contexts.rs b/clarity/src/vm/contexts.rs index 20b9752e6f7..1e167826acf 100644 --- a/clarity/src/vm/contexts.rs +++ b/clarity/src/vm/contexts.rs @@ -1875,7 +1875,7 @@ impl<'a> LocalContext<'a> { self.depth } - pub fn function_context(&self) -> &LocalContext { + pub fn function_context(&self) -> &LocalContext<'_> { match self.function_context { Some(context) => context, None => self, diff --git a/clarity/src/vm/database/clarity_store.rs b/clarity/src/vm/database/clarity_store.rs index 4d92379fb29..e1d6dacaeee 100644 --- a/clarity/src/vm/database/clarity_store.rs +++ b/clarity/src/vm/database/clarity_store.rs @@ -187,11 +187,11 @@ impl NullBackingStore { NullBackingStore {} } - pub fn as_clarity_db(&mut self) -> ClarityDatabase { + pub fn as_clarity_db(&mut self) -> ClarityDatabase<'_> { ClarityDatabase::new(self, &NULL_HEADER_DB, &NULL_BURN_STATE_DB) } - pub fn as_analysis_db(&mut self) -> AnalysisDatabase { + pub fn as_analysis_db(&mut self) -> AnalysisDatabase<'_> { AnalysisDatabase::new(self) } } diff --git a/clarity/src/vm/database/sqlite.rs b/clarity/src/vm/database/sqlite.rs index 2a100a0b802..7264a533bb4 100644 --- a/clarity/src/vm/database/sqlite.rs +++ b/clarity/src/vm/database/sqlite.rs @@ -302,11 +302,11 @@ impl MemoryBackingStore { memory_marf } - pub fn as_clarity_db(&mut self) -> ClarityDatabase { + pub fn as_clarity_db(&mut self) -> ClarityDatabase<'_> { ClarityDatabase::new(self, &NULL_HEADER_DB, &NULL_BURN_STATE_DB) } - pub fn as_analysis_db(&mut self) -> AnalysisDatabase { + pub fn as_analysis_db(&mut self) -> AnalysisDatabase<'_> { AnalysisDatabase::new(self) } } @@ -405,7 +405,7 @@ impl ClarityBackingStore for MemoryBackingStore { } impl ToSql for ExecutionCost { - fn to_sql(&self) -> rusqlite::Result { + fn to_sql(&self) -> rusqlite::Result> { let val = serde_json::to_string(self) .map_err(|e| rusqlite::Error::ToSqlConversionFailure(Box::new(e)))?; Ok(ToSqlOutput::from(val)) diff --git a/clarity/src/vm/tests/mod.rs b/clarity/src/vm/tests/mod.rs index 7d58fb515e6..bf9cc68581d 100644 --- a/clarity/src/vm/tests/mod.rs +++ b/clarity/src/vm/tests/mod.rs @@ -171,7 +171,7 @@ pub fn tl_env_factory() -> TopLevelMemoryEnvironmentGenerator { pub struct MemoryEnvironmentGenerator(MemoryBackingStore); impl MemoryEnvironmentGenerator { - fn get_env(&mut self, epoch: StacksEpochId) -> OwnedEnvironment { + fn get_env(&mut self, epoch: StacksEpochId) -> OwnedEnvironment<'_, '_> { let mut db = self.0.as_clarity_db(); db.begin(); db.set_clarity_epoch_version(epoch).unwrap(); @@ -190,7 +190,7 @@ impl MemoryEnvironmentGenerator { pub struct TopLevelMemoryEnvironmentGenerator(MemoryBackingStore); impl TopLevelMemoryEnvironmentGenerator { - pub fn get_env(&mut self, epoch: StacksEpochId) -> OwnedEnvironment { + pub fn get_env(&mut self, epoch: StacksEpochId) -> OwnedEnvironment<'_, '_> { let mut db = self.0.as_clarity_db(); db.begin(); db.set_clarity_epoch_version(epoch).unwrap(); diff --git a/stacks-common/src/bitvec.rs b/stacks-common/src/bitvec.rs index 058b997077c..5da5c120bc9 100644 --- a/stacks-common/src/bitvec.rs +++ b/stacks-common/src/bitvec.rs @@ -171,7 +171,7 @@ impl BitVec { Ok(bitvec) } - pub fn iter(&self) -> BitVecIter { + pub fn iter(&self) -> BitVecIter<'_, MAX_SIZE> { let byte = self.data.first(); BitVecIter { index: 0, diff --git a/stacks-common/src/deps_common/bitcoin/blockdata/script.rs b/stacks-common/src/deps_common/bitcoin/blockdata/script.rs index 39e341cd5e9..be3a137e7d1 100644 --- a/stacks-common/src/deps_common/bitcoin/blockdata/script.rs +++ b/stacks-common/src/deps_common/bitcoin/blockdata/script.rs @@ -385,7 +385,7 @@ impl Script { /// opcodes, datapushes and errors. At most one error will be returned and then the /// iterator will end. To instead iterate over the script as sequence of bytes, treat /// it as a slice using `script[..]` or convert it to a vector using `into_bytes()`. - pub fn iter(&self, enforce_minimal: bool) -> Instructions { + pub fn iter(&self, enforce_minimal: bool) -> Instructions<'_> { Instructions { data: &self.0[..], enforce_minimal, diff --git a/stacks-common/src/types/sqlite.rs b/stacks-common/src/types/sqlite.rs index 57010ea118e..ca54bbe33ec 100644 --- a/stacks-common/src/types/sqlite.rs +++ b/stacks-common/src/types/sqlite.rs @@ -36,14 +36,14 @@ impl FromSql for Sha256dHash { } impl ToSql for Sha256dHash { - fn to_sql(&self) -> rusqlite::Result { + fn to_sql(&self) -> rusqlite::Result> { let hex_str = self.be_hex_string(); Ok(hex_str.into()) } } -impl rusqlite::types::ToSql for StacksAddress { - fn to_sql(&self) -> rusqlite::Result { +impl ToSql for StacksAddress { + fn to_sql(&self) -> rusqlite::Result> { let addr_str = self.to_string(); Ok(addr_str.into()) } diff --git a/stacks-common/src/util/macros.rs b/stacks-common/src/util/macros.rs index 6aaf00542cd..f19a9968613 100644 --- a/stacks-common/src/util/macros.rs +++ b/stacks-common/src/util/macros.rs @@ -749,7 +749,7 @@ macro_rules! impl_byte_array_rusqlite_only { } impl rusqlite::types::ToSql for $thing { - fn to_sql(&self) -> rusqlite::Result { + fn to_sql(&self) -> rusqlite::Result> { let hex_str = self.to_hex(); Ok(hex_str.into()) } diff --git a/stacks-common/src/util/vrf.rs b/stacks-common/src/util/vrf.rs index a0cbee3373f..6176c150068 100644 --- a/stacks-common/src/util/vrf.rs +++ b/stacks-common/src/util/vrf.rs @@ -68,7 +68,7 @@ impl Eq for VRFPublicKey {} impl PartialOrd for VRFPublicKey { fn partial_cmp(&self, other: &VRFPublicKey) -> Option { - Some(self.as_bytes().to_vec().cmp(&other.as_bytes().to_vec())) + Some(self.cmp(other)) } } diff --git a/stacks-node/src/event_dispatcher.rs b/stacks-node/src/event_dispatcher.rs index f4a8acf068d..1de54267116 100644 --- a/stacks-node/src/event_dispatcher.rs +++ b/stacks-node/src/event_dispatcher.rs @@ -615,7 +615,7 @@ impl EventObserver { fn make_new_block_txs_payload( receipt: &StacksTransactionReceipt, tx_index: u32, - ) -> TransactionEventPayload { + ) -> TransactionEventPayload<'_> { let tx = &receipt.transaction; let status = match (receipt.post_condition_aborted, &receipt.result) { diff --git a/stackslib/src/chainstate/nakamoto/staging_blocks.rs b/stackslib/src/chainstate/nakamoto/staging_blocks.rs index ae5ef3a9c1e..a378a68ec7a 100644 --- a/stackslib/src/chainstate/nakamoto/staging_blocks.rs +++ b/stackslib/src/chainstate/nakamoto/staging_blocks.rs @@ -184,7 +184,7 @@ impl DerefMut for NakamotoStagingBlocksConn { } impl NakamotoStagingBlocksConn { - pub fn conn(&self) -> NakamotoStagingBlocksConnRef { + pub fn conn(&self) -> NakamotoStagingBlocksConnRef<'_> { NakamotoStagingBlocksConnRef(&self.0) } } @@ -211,7 +211,7 @@ impl NakamotoStagingBlocksTx<'_> { self.0.commit() } - pub fn conn(&self) -> NakamotoStagingBlocksConnRef { + pub fn conn(&self) -> NakamotoStagingBlocksConnRef<'_> { NakamotoStagingBlocksConnRef(self.0.deref()) } } @@ -746,7 +746,7 @@ impl StacksChainState { } /// Get a ref to the nakamoto staging blocks connection - pub fn nakamoto_blocks_db(&self) -> NakamotoStagingBlocksConnRef { + pub fn nakamoto_blocks_db(&self) -> NakamotoStagingBlocksConnRef<'_> { NakamotoStagingBlocksConnRef(&self.nakamoto_staging_blocks_conn) } diff --git a/stackslib/src/clarity_vm/clarity.rs b/stackslib/src/clarity_vm/clarity.rs index 6ef509bdc32..38cf2ba5b3b 100644 --- a/stackslib/src/clarity_vm/clarity.rs +++ b/stackslib/src/clarity_vm/clarity.rs @@ -1707,7 +1707,7 @@ impl<'a> ClarityBlockConnection<'a, '_> { }) } - pub fn start_transaction_processing(&mut self) -> ClarityTransactionConnection { + pub fn start_transaction_processing(&mut self) -> ClarityTransactionConnection<'_, '_> { ClarityTransactionConnection::new( &mut self.datastore, self.header_db, diff --git a/stackslib/src/util_lib/db.rs b/stackslib/src/util_lib/db.rs index f31e5fe76ed..bb396e0e97d 100644 --- a/stackslib/src/util_lib/db.rs +++ b/stackslib/src/util_lib/db.rs @@ -334,7 +334,7 @@ macro_rules! impl_byte_array_from_column { } impl rusqlite::types::ToSql for $thing { - fn to_sql(&self) -> rusqlite::Result { + fn to_sql(&self) -> rusqlite::Result> { let hex_str = self.to_hex(); Ok(hex_str.into()) }