Skip to content

Commit 12441ee

Browse files
committed
Merge #283: manually update nightly version to 2026-06-11.
c5bac55 manually update nightly version to 2026-06-11. (Andrew Poelstra) Pull request description: Clippy removed the `from_iter_instead_of_collect` lint due to being "problematic". I don't know that we ever used this, but we had explicitly enabled it. Clippy also added a new `needless_return_with_question_mark` lint which fires numerous times throughout the crate. Supercedes #274. ACKs for top commit: delta1: ACK c5bac55; tested locally Tree-SHA512: c70171a11c22935e5ab6d6d32faa874cff91981a36d1ac0583698e3a7334f6526dbf6cd67fba39a23f9d7ef5279c60b35ec84edf36b10b4d8c72982105a07e66
2 parents 2d7209b + c5bac55 commit 12441ee

5 files changed

Lines changed: 10 additions & 11 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2018"
1111
rust-version = "1.74.0"
1212

1313
[workspace.metadata.rbmt.toolchains]
14-
nightly = "nightly-2026-05-14"
14+
nightly = "nightly-2026-06-11"
1515
stable = "1.96.0"
1616

1717
[features]
@@ -99,7 +99,6 @@ explicit_iter_loop = "warn"
9999
filter_map_next = "warn"
100100
flat_map_option = "warn"
101101
fn_params_excessive_bools = "warn"
102-
from_iter_instead_of_collect = "warn"
103102
if_not_else = "warn"
104103
ignored_unit_patterns = "warn"
105104
implicit_clone = "warn"

src/blech32/decode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ impl<'s> CheckedHrpstring<'s> {
257257
let padding_len = fe_iter.len() * 5 % 8;
258258

259259
if padding_len > 4 {
260-
return Err(PaddingError::TooMuch)?;
260+
return Err(PaddingError::TooMuch);
261261
}
262262

263263
let last_fe = fe_iter.last().expect("checked above");

src/pset/map/global.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ impl Map for Global {
174174
}
175175
self.scalars.push(scalar);
176176
} else {
177-
return Err(Error::InvalidKey(raw_key))?;
177+
return Err(Error::InvalidKey(raw_key).into());
178178
}
179179
} else if prop_key.is_pset_key()
180180
&& prop_key.subtype == PSBT_ELEMENTS_GLOBAL_TX_MODIFIABLE
181181
{
182182
if prop_key.key.is_empty() && raw_value.len() == 1 {
183183
self.elements_tx_modifiable_flag = Some(raw_value[0]);
184184
} else {
185-
return Err(Error::InvalidKey(raw_key))?;
185+
return Err(Error::InvalidKey(raw_key).into());
186186
}
187187
} else {
188188
match self.proprietary.entry(prop_key) {
@@ -467,15 +467,15 @@ impl Decodable for Global {
467467
}
468468
scalars.push(scalar);
469469
} else {
470-
return Err(Error::InvalidKey(raw_key))?;
470+
return Err(Error::InvalidKey(raw_key).into());
471471
}
472472
} else if prop_key.is_pset_key()
473473
&& prop_key.subtype == PSBT_ELEMENTS_GLOBAL_TX_MODIFIABLE
474474
{
475475
if prop_key.key.is_empty() && raw_value.len() == 1 {
476476
elements_tx_modifiable_flag = Some(raw_value[0]);
477477
} else {
478-
return Err(Error::InvalidKey(raw_key))?;
478+
return Err(Error::InvalidKey(raw_key).into());
479479
}
480480
} else {
481481
match proprietary.entry(prop_key) {
@@ -506,7 +506,7 @@ impl Decodable for Global {
506506
// Mandatory fields
507507
let version = version.ok_or(Error::IncorrectPsetVersion)?;
508508
if version != 2 {
509-
return Err(Error::IncorrectPsetVersion)?;
509+
return Err(Error::IncorrectPsetVersion.into());
510510
}
511511
let tx_version = tx_version.ok_or(Error::MissingTxVersion)?;
512512
let input_count = input_count.ok_or(Error::MissingInputCount)?.0 as usize;

src/pset/map/input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ impl Map for Input {
688688
)?;
689689
}
690690
PSET_IN_PREVIOUS_TXID | PSET_IN_OUTPUT_INDEX => {
691-
return Err(Error::DuplicateKey(raw_key))?;
691+
return Err(Error::DuplicateKey(raw_key).into());
692692
}
693693
PSET_IN_SEQUENCE => {
694694
impl_pset_insert_pair! {

src/pset/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ impl Decodable for PartiallySignedTransaction {
744744

745745
// Maximum pset input size supported
746746
if inputs_len > 10_000 {
747-
return Err(Error::TooLargePset)?;
747+
return Err(Error::TooLargePset.into());
748748
}
749749

750750
let mut inputs: Vec<Input> = Vec::with_capacity(inputs_len);
@@ -761,7 +761,7 @@ impl Decodable for PartiallySignedTransaction {
761761

762762
// Maximum pset input size supported
763763
if outputs_len > 10_000 {
764-
return Err(Error::TooLargePset)?;
764+
return Err(Error::TooLargePset.into());
765765
}
766766

767767
let mut outputs: Vec<Output> = Vec::with_capacity(outputs_len);

0 commit comments

Comments
 (0)