Skip to content

Commit c21ff21

Browse files
committed
Merge #298: ci: automated update to rustc 1.89.0
00ee0ae clippy: fix mismatched lifetime syntax (valued mammal) 2748d15 ci: automated update to rustc 1.89.0 (Github Action) Pull request description: Automated update to Github CI workflow `cont_integration.yml` by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action ACKs for top commit: ValuedMammal: ACK 00ee0ae Tree-SHA512: fe2e990d540d60a83a8a81c70138f1296b4b32ff8100115c746dcf2c9e26f50dc753bb9bfd515a0bbf111a57baa1a6a173a677e1f2e7693479de24230ca754ff
2 parents 234c1ec + 00ee0ae commit c21ff21

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.88.0
1+
1.89.0

wallet/src/descriptor/policy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ impl<Ctx: ScriptContext + 'static> ExtractPolicy for Miniscript<DescriptorPublic
10541054
}
10551055
}
10561056

1057-
fn psbt_inputs_sat(psbt: &Psbt) -> impl Iterator<Item = PsbtInputSatisfier> {
1057+
fn psbt_inputs_sat(psbt: &Psbt) -> impl Iterator<Item = PsbtInputSatisfier<'_>> {
10581058
(0..psbt.inputs.len()).map(move |i| PsbtInputSatisfier::new(psbt, i))
10591059
}
10601060

wallet/src/wallet/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ impl Wallet {
11651165
/// ```
11661166
///
11671167
/// [`Anchor`]: bdk_chain::Anchor
1168-
pub fn get_tx(&self, txid: Txid) -> Option<WalletTx> {
1168+
pub fn get_tx(&self, txid: Txid) -> Option<WalletTx<'_>> {
11691169
let graph = self.indexed_graph.graph();
11701170
graph
11711171
.list_canonical_txs(
@@ -1187,7 +1187,7 @@ impl Wallet {
11871187
///
11881188
/// To iterate over all canonical transactions, including those that are irrelevant, use
11891189
/// [`TxGraph::list_canonical_txs`].
1190-
pub fn transactions(&self) -> impl Iterator<Item = WalletTx> + '_ {
1190+
pub fn transactions<'a>(&'a self) -> impl Iterator<Item = WalletTx<'a>> + 'a {
11911191
let tx_graph = self.indexed_graph.graph();
11921192
let tx_index = &self.indexed_graph.index;
11931193
tx_graph
@@ -1215,7 +1215,7 @@ impl Wallet {
12151215
/// wallet.transactions_sort_by(|tx1, tx2| tx2.chain_position.cmp(&tx1.chain_position));
12161216
/// # Ok::<(), anyhow::Error>(())
12171217
/// ```
1218-
pub fn transactions_sort_by<F>(&self, compare: F) -> Vec<WalletTx>
1218+
pub fn transactions_sort_by<F>(&self, compare: F) -> Vec<WalletTx<'_>>
12191219
where
12201220
F: FnMut(&WalletTx, &WalletTx) -> Ordering,
12211221
{

0 commit comments

Comments
 (0)